diff --git a/build/build.xml b/build/build.xml
index daa0c077d8c..f77e4046ac6 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -33,7 +33,7 @@
 	<property name="concatenated" value="jquery-ui" />
 	<property name="concatenated.i18n" value="jquery-ui-i18n" />
 
-	<property name="core.files" value="ui.core.js, ui.draggable.js, ui.droppable.js, ui.resizable.js, ui.selectable.js, ui.sortable.js, effects.core.js" />
+	<property name="core.files" value="jquery.ui.core.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.effects.core.js" />
 
 	<property description="YUI Compressor" name="yui-jar" value="${build.dir}/yuicompressor-2.4.2.jar" />
 	
diff --git a/build/build/style.xsl b/build/build/style.xsl
index 146409344fc..32daeed9434 100644
--- a/build/build/style.xsl
+++ b/build/build/style.xsl
@@ -105,9 +105,9 @@
 				<div id="docs-overview-sidebar">
 					<h4>Dependencies:</h4>
 					<ul>							
-						<li><a href="#">ui.core.js</a></li>
-						<li><a href="#">ui.draggable.js <span>(Optional)</span></a></li>
-						<li><a href="#">ui.resizable.js <span>(Optional)</span></a></li>
+						<li><a href="#">jquery.ui.core.js</a></li>
+						<li><a href="#">jquery.ui.draggable.js <span>(Optional)</span></a></li>
+						<li><a href="#">jquery.ui.resizable.js <span>(Optional)</span></a></li>
 					</ul>
 				</div>
 				<div id="docs-overview-main">
diff --git a/demos/accordion/collapsible.html b/demos/accordion/collapsible.html
index 381d5fea366..8f4784367d8 100644
--- a/demos/accordion/collapsible.html
+++ b/demos/accordion/collapsible.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Accordion - Collapse content</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/accordion/custom-icons.html b/demos/accordion/custom-icons.html
index 914ba32cd93..1ff4d4bd2bf 100644
--- a/demos/accordion/custom-icons.html
+++ b/demos/accordion/custom-icons.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Accordion - Customize icons</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/accordion/default.html b/demos/accordion/default.html
index 9493b266d1d..843e122cad8 100644
--- a/demos/accordion/default.html
+++ b/demos/accordion/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Accordion - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/accordion/fillspace.html b/demos/accordion/fillspace.html
index 3523d006e6a..5576d3475fc 100644
--- a/demos/accordion/fillspace.html
+++ b/demos/accordion/fillspace.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Accordion - Fill space</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/accordion/mouseover.html b/demos/accordion/mouseover.html
index 2181649ca40..c2a2d0e52e0 100644
--- a/demos/accordion/mouseover.html
+++ b/demos/accordion/mouseover.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Accordion - Open on mouseover</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/accordion/no-auto-height.html b/demos/accordion/no-auto-height.html
index b76c8d9cca2..d56b3adebb8 100644
--- a/demos/accordion/no-auto-height.html
+++ b/demos/accordion/no-auto-height.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Accordion - No Auto Height</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/accordion/sortable.html b/demos/accordion/sortable.html
index 82e119bb4b7..91e2df5d79a 100644
--- a/demos/accordion/sortable.html
+++ b/demos/accordion/sortable.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Accordion - Sortable</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/addClass/default.html b/demos/addClass/default.html
index eae24b92630..3b3560e14b9 100644
--- a/demos/addClass/default.html
+++ b/demos/addClass/default.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Effects - addClass Demo</title>
 	<link type="text/css" href="http://jquery-ui.googlecode.com/svn/trunk/themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="http://jquery-ui.googlecode.com/svn/trunk/jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="http://jquery-ui.googlecode.com/svn/trunk/ui/effects.core.js"></script>
+	<script type="text/javascript" src="http://jquery-ui.googlecode.com/svn/trunk/ui/jquery.effects.core.js"></script>
 	<link type="text/css" href="http://jquery-ui.googlecode.com/svn/trunk/demos/demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; position: relative;}
diff --git a/demos/animate/default.html b/demos/animate/default.html
index a01f08ad7ea..4dcd1b08051 100644
--- a/demos/animate/default.html
+++ b/demos/animate/default.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Effects - Animate Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; position: relative;}
diff --git a/demos/datepicker/alt-field.html b/demos/datepicker/alt-field.html
index 372e2bf2cae..dc94c8d8035 100644
--- a/demos/datepicker/alt-field.html
+++ b/demos/datepicker/alt-field.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Populate alternate field</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/buttonbar.html b/demos/datepicker/buttonbar.html
index eeea08a5d8b..3a945fa44c1 100644
--- a/demos/datepicker/buttonbar.html
+++ b/demos/datepicker/buttonbar.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Display button bar</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/date-formats.html b/demos/datepicker/date-formats.html
index 6150a04f5fc..b4cc80b2667 100644
--- a/demos/datepicker/date-formats.html
+++ b/demos/datepicker/date-formats.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Format date</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/default.html b/demos/datepicker/default.html
index 368e0bc3977..e4748cd8085 100644
--- a/demos/datepicker/default.html
+++ b/demos/datepicker/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/dropdown-month-year.html b/demos/datepicker/dropdown-month-year.html
index c16931009dd..46b55d38a92 100644
--- a/demos/datepicker/dropdown-month-year.html
+++ b/demos/datepicker/dropdown-month-year.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Display month &amp; year menus</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/event-search.html b/demos/datepicker/event-search.html
index 0e71100a552..53482c6004a 100644
--- a/demos/datepicker/event-search.html
+++ b/demos/datepicker/event-search.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Display multiple months</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/icon-trigger.html b/demos/datepicker/icon-trigger.html
index f66c4fc3047..7aba0ecc77c 100644
--- a/demos/datepicker/icon-trigger.html
+++ b/demos/datepicker/icon-trigger.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Icon trigger</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/inline.html b/demos/datepicker/inline.html
index 2d5ad757f3e..dfee2c4b695 100644
--- a/demos/datepicker/inline.html
+++ b/demos/datepicker/inline.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Display inline</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/localization.html b/demos/datepicker/localization.html
index 49aacaa0117..1e87c6ac092 100644
--- a/demos/datepicker/localization.html
+++ b/demos/datepicker/localization.html
@@ -4,54 +4,54 @@
 	<title>jQuery UI Datepicker - Localize calendar</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-ar.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-az.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-bg.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-ca.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-cs.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-da.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-de.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-el.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-eo.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-es.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-et.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-eu.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-fa.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-fi.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-fr.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-fr-CH.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-he.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-hr.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-hu.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-hy.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-id.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-is.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-it.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-ja.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-ko.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-lt.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-lv.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-ms.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-nl.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-no.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-pl.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-pt-BR.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-ro.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-ru.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-sk.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-sl.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-sq.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-sr.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-sr-SR.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-sv.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-th.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-tr.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-uk.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-vi.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-zh-CN.js"></script>
-	<script type="text/javascript" src="../../ui/i18n/ui.datepicker-zh-TW.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-ar.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-az.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-bg.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-ca.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-cs.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-da.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-de.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-el.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-eo.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-es.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-et.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-eu.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-fa.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-fi.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-fr-CH.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-he.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-hr.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-hu.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-hy.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-id.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-is.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-it.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-ja.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-ko.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-lt.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-lv.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-ms.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-nl.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-no.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-pl.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-pt-BR.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-ro.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-ru.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-sk.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-sl.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-sq.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-sr.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-sr-SR.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-sv.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-th.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-tr.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-uk.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-vi.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-zh-CN.js"></script>
+	<script type="text/javascript" src="../../ui/i18n/jquery.ui.datepicker-zh-TW.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/min-max.html b/demos/datepicker/min-max.html
index 06a17763453..9a2e458745e 100644
--- a/demos/datepicker/min-max.html
+++ b/demos/datepicker/min-max.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Restrict date range</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/multiple-calendars.html b/demos/datepicker/multiple-calendars.html
index 86e55a06e50..2ef8a8b1efe 100644
--- a/demos/datepicker/multiple-calendars.html
+++ b/demos/datepicker/multiple-calendars.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Display multiple months</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/other-months.html b/demos/datepicker/other-months.html
index f555f3f983e..3f570b9234b 100644
--- a/demos/datepicker/other-months.html
+++ b/demos/datepicker/other-months.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Dates in other months</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/datepicker/show-week.html b/demos/datepicker/show-week.html
index d14c7222593..233fc3b8b7a 100644
--- a/demos/datepicker/show-week.html
+++ b/demos/datepicker/show-week.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Datepicker - Show week of the year</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/dialog/animated.html b/demos/dialog/animated.html
index bf0d74efca0..2845a4b9ad9 100644
--- a/demos/dialog/animated.html
+++ b/demos/dialog/animated.html
@@ -4,15 +4,15 @@
 	<title>jQuery UI Dialog - Animation</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
-	<script type="text/javascript" src="../../ui/effects.blind.js"></script>
-	<script type="text/javascript" src="../../ui/effects.explode.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.blind.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$.ui.dialog.defaults.stackfix = true;
diff --git a/demos/dialog/default.html b/demos/dialog/default.html
index f59ee2d1325..bf673f79931 100644
--- a/demos/dialog/default.html
+++ b/demos/dialog/default.html
@@ -4,12 +4,12 @@
 	<title>jQuery UI Dialog - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$.ui.dialog.defaults.stackfix = true;
diff --git a/demos/dialog/modal-confirmation.html b/demos/dialog/modal-confirmation.html
index 6a4b10d2257..5dff755e2ce 100644
--- a/demos/dialog/modal-confirmation.html
+++ b/demos/dialog/modal-confirmation.html
@@ -4,12 +4,12 @@
 	<title>jQuery UI Dialog - Modal confirmation</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html
index 5ef2089527e..7b49019b697 100644
--- a/demos/dialog/modal-form.html
+++ b/demos/dialog/modal-form.html
@@ -4,13 +4,13 @@
 	<title>jQuery UI Dialog - Modal form</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		body { font-size: 62.5%; }
diff --git a/demos/dialog/modal-message.html b/demos/dialog/modal-message.html
index 24282589f55..54d577b6038 100644
--- a/demos/dialog/modal-message.html
+++ b/demos/dialog/modal-message.html
@@ -4,12 +4,12 @@
 	<title>jQuery UI Dialog - Modal message</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/dialog/modal.html b/demos/dialog/modal.html
index fd4a7ba1fde..4fe01fe034f 100644
--- a/demos/dialog/modal.html
+++ b/demos/dialog/modal.html
@@ -4,12 +4,12 @@
 	<title>jQuery UI Dialog - Basic modal</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/draggable/constrain-movement.html b/demos/draggable/constrain-movement.html
index 73496bb643d..30c81f5e678 100644
--- a/demos/draggable/constrain-movement.html
+++ b/demos/draggable/constrain-movement.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Constrain movement</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	.draggable { width: 90px; height: 90px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
diff --git a/demos/draggable/cursor-style.html b/demos/draggable/cursor-style.html
index 14b3b2915d0..95364e1db08 100644
--- a/demos/draggable/cursor-style.html
+++ b/demos/draggable/cursor-style.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Cursor style</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable, #draggable2, #draggable3 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
diff --git a/demos/draggable/default.html b/demos/draggable/default.html
index 344accc4086..b1bb57a3303 100644
--- a/demos/draggable/default.html
+++ b/demos/draggable/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable { width: 150px; height: 150px; padding: 0.5em; }
diff --git a/demos/draggable/delay-start.html b/demos/draggable/delay-start.html
index 6f49d17a874..f19c270e510 100644
--- a/demos/draggable/delay-start.html
+++ b/demos/draggable/delay-start.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Delay start</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable, #draggable2 { width: 120px; height: 120px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
diff --git a/demos/draggable/events.html b/demos/draggable/events.html
index ca13a9f87b7..aa2c1b75529 100644
--- a/demos/draggable/events.html
+++ b/demos/draggable/events.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Events</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#draggable { width: 16em; padding: 0 1em; }
diff --git a/demos/draggable/handle.html b/demos/draggable/handle.html
index 8433a1e889d..7ec5f93226d 100644
--- a/demos/draggable/handle.html
+++ b/demos/draggable/handle.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Handles</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable, #draggable2 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
diff --git a/demos/draggable/revert.html b/demos/draggable/revert.html
index 84336407e24..f5d4e3eecad 100644
--- a/demos/draggable/revert.html
+++ b/demos/draggable/revert.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Revert position</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable, #draggable2 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
diff --git a/demos/draggable/scroll.html b/demos/draggable/scroll.html
index 201ce9c30ed..2fd0e66fbe4 100644
--- a/demos/draggable/scroll.html
+++ b/demos/draggable/scroll.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Auto-scroll</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable, #draggable2, #draggable3 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
diff --git a/demos/draggable/snap-to.html b/demos/draggable/snap-to.html
index 43c0585c11c..82b2b918d21 100644
--- a/demos/draggable/snap-to.html
+++ b/demos/draggable/snap-to.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Snap to element or grid</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	.draggable { width: 90px; height: 80px; padding: 5px; float: left; margin: 0 10px 10px 0; font-size: .9em; }
diff --git a/demos/draggable/sortable.html b/demos/draggable/sortable.html
index 940471afee8..5d2fa946158 100644
--- a/demos/draggable/sortable.html
+++ b/demos/draggable/sortable.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Draggable + Sortable</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	.demo ul { list-style-type: none; margin: 0; padding: 0; margin-bottom: 10px; }
diff --git a/demos/draggable/visual-feedback.html b/demos/draggable/visual-feedback.html
index 25c42fdadf9..9f8f03745b5 100644
--- a/demos/draggable/visual-feedback.html
+++ b/demos/draggable/visual-feedback.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable - Visual feedback</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable, #draggable2, #draggable3, #set div { width: 90px; height: 90px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
diff --git a/demos/droppable/accepted-elements.html b/demos/droppable/accepted-elements.html
index 3a12baa5c27..94bef2dcc5f 100644
--- a/demos/droppable/accepted-elements.html
+++ b/demos/droppable/accepted-elements.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Droppable - Accept Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }
diff --git a/demos/droppable/default.html b/demos/droppable/default.html
index 03fdace1d2c..e90f1afe281 100644
--- a/demos/droppable/default.html
+++ b/demos/droppable/default.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Droppable - Default Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; }
diff --git a/demos/droppable/photo-manager.html b/demos/droppable/photo-manager.html
index 868085afc20..c6ed853bd32 100644
--- a/demos/droppable/photo-manager.html
+++ b/demos/droppable/photo-manager.html
@@ -4,11 +4,11 @@
 		<title>jQuery UI Droppable - Simple photo manager</title>
 		<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 		<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-		<script type="text/javascript" src="../../ui/ui.core.js"></script>
-		<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-		<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
-		<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-		<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
+		<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+		<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+		<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
+		<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+		<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
 		<link type="text/css" href="../demos.css" rel="stylesheet" />
 		<style type="text/css">
 			#gallery { float: left; width: 65%; min-height: 12em; } * html #gallery { height: 12em; } /* IE6 */
diff --git a/demos/droppable/propagation.html b/demos/droppable/propagation.html
index e9c5026659c..4ea0354cbcf 100644
--- a/demos/droppable/propagation.html
+++ b/demos/droppable/propagation.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Droppable - Prevent propagation</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable { width: 100px; height: 40px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; }
diff --git a/demos/droppable/revert.html b/demos/droppable/revert.html
index 01fea57a4f8..c10387a2fb0 100644
--- a/demos/droppable/revert.html
+++ b/demos/droppable/revert.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Droppable - Revert draggable position</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable, #draggable2 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; }
diff --git a/demos/droppable/visual-feedback.html b/demos/droppable/visual-feedback.html
index 8f7e929c119..af811a4d83c 100644
--- a/demos/droppable/visual-feedback.html
+++ b/demos/droppable/visual-feedback.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Droppable - Visual feedback</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable, #draggable2 { width: 90px; height: 90px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; }
diff --git a/demos/effect/default.html b/demos/effect/default.html
index 4187080cd69..80272aac9bf 100644
--- a/demos/effect/default.html
+++ b/demos/effect/default.html
@@ -4,19 +4,19 @@
 	<title>jQuery UI Effects - Effect Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
-	<script type="text/javascript" src="../../ui/effects.blind.js"></script>
-	<script type="text/javascript" src="../../ui/effects.bounce.js"></script>
-	<script type="text/javascript" src="../../ui/effects.clip.js"></script>
-	<script type="text/javascript" src="../../ui/effects.drop.js"></script>
-	<script type="text/javascript" src="../../ui/effects.explode.js"></script>
-	<script type="text/javascript" src="../../ui/effects.fold.js"></script>
-	<script type="text/javascript" src="../../ui/effects.highlight.js"></script>
-	<script type="text/javascript" src="../../ui/effects.pulsate.js"></script>
-	<script type="text/javascript" src="../../ui/effects.scale.js"></script>
-	<script type="text/javascript" src="../../ui/effects.shake.js"></script>
-	<script type="text/javascript" src="../../ui/effects.slide.js"></script>
-	<script type="text/javascript" src="../../ui/effects.transfer.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.blind.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.bounce.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.clip.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.drop.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.fold.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.highlight.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.pulsate.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.scale.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.shake.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.slide.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.transfer.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; position: relative;}
diff --git a/demos/effect/easing.html b/demos/effect/easing.html
index 856877e467f..8add1ea2c8d 100644
--- a/demos/effect/easing.html
+++ b/demos/effect/easing.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Effects - Effect Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.graph {
diff --git a/demos/hide/default.html b/demos/hide/default.html
index a4a5ff285f8..a75bbcb0cde 100644
--- a/demos/hide/default.html
+++ b/demos/hide/default.html
@@ -4,19 +4,19 @@
 	<title>jQuery UI Effects - Hide Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
-	<script type="text/javascript" src="../../ui/effects.blind.js"></script>
-	<script type="text/javascript" src="../../ui/effects.bounce.js"></script>
-	<script type="text/javascript" src="../../ui/effects.clip.js"></script>
-	<script type="text/javascript" src="../../ui/effects.drop.js"></script>
-	<script type="text/javascript" src="../../ui/effects.explode.js"></script>
-	<script type="text/javascript" src="../../ui/effects.fold.js"></script>
-	<script type="text/javascript" src="../../ui/effects.highlight.js"></script>
-	<script type="text/javascript" src="../../ui/effects.pulsate.js"></script>
-	<script type="text/javascript" src="../../ui/effects.scale.js"></script>
-	<script type="text/javascript" src="../../ui/effects.shake.js"></script>
-	<script type="text/javascript" src="../../ui/effects.slide.js"></script>
-	<script type="text/javascript" src="../../ui/effects.transfer.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.blind.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.bounce.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.clip.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.drop.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.fold.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.highlight.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.pulsate.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.scale.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.shake.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.slide.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.transfer.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; }
diff --git a/demos/index.html b/demos/index.html
index 8b5eb3f5d39..cb42ace366f 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -6,79 +6,79 @@
 	<link type="text/css" href="../themes/base/ui.all.css" rel="stylesheet" />
 	<link type="text/css" href="demos.css" rel="stylesheet" />
 	<script type="text/javascript" src="../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../ui/ui.droppable.js"></script>
-	<script type="text/javascript" src="../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../ui/ui.progressbar.js"></script>
-	<script type="text/javascript" src="../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../ui/ui.selectable.js"></script>
-	<script type="text/javascript" src="../ui/ui.slider.js"></script>
-	<script type="text/javascript" src="../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../ui/ui.tabs.js"></script>
-	<script type="text/javascript" src="../ui/effects.core.js"></script>
-	<script type="text/javascript" src="../ui/effects.blind.js"></script>
-	<script type="text/javascript" src="../ui/effects.bounce.js"></script>
-	<script type="text/javascript" src="../ui/effects.clip.js"></script>
-	<script type="text/javascript" src="../ui/effects.drop.js"></script>
-	<script type="text/javascript" src="../ui/effects.explode.js"></script>
-	<script type="text/javascript" src="../ui/effects.fold.js"></script>
-	<script type="text/javascript" src="../ui/effects.highlight.js"></script>
-	<script type="text/javascript" src="../ui/effects.pulsate.js"></script>
-	<script type="text/javascript" src="../ui/effects.scale.js"></script>
-	<script type="text/javascript" src="../ui/effects.shake.js"></script>
-	<script type="text/javascript" src="../ui/effects.slide.js"></script>
-	<script type="text/javascript" src="../ui/effects.transfer.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-ar.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-az.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-bg.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-ca.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-cs.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-da.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-de.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-el.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-eo.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-es.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-et.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-eu.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-fa.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-fi.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-fr.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-fr-CH.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-he.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-hr.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-hu.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-hy.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-id.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-is.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-it.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-ja.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-ko.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-lt.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-lv.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-ms.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-nl.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-no.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-pl.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-pt-BR.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-ro.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-ru.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-sk.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-sl.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-sq.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-sr.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-sr-SR.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-sv.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-th.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-tr.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-uk.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-vi.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-zh-CN.js"></script>
-	<script type="text/javascript" src="../ui/i18n/ui.datepicker-zh-TW.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.droppable.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.progressbar.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.selectable.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.slider.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../ui/jquery.ui.tabs.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.core.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.blind.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.bounce.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.clip.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.drop.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.explode.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.fold.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.highlight.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.pulsate.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.scale.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.shake.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.slide.js"></script>
+	<script type="text/javascript" src="../ui/jquery.effects.transfer.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-ar.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-az.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-bg.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-ca.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-cs.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-da.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-de.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-el.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-eo.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-es.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-et.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-eu.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-fa.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-fi.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-fr.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-fr-CH.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-he.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-hr.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-hu.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-hy.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-id.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-is.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-it.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-ja.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-ko.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-lt.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-lv.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-ms.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-nl.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-no.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-pl.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-pt-BR.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-ro.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-ru.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-sk.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-sl.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-sq.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-sr.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-sr-SR.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-sv.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-th.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-tr.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-uk.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-vi.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-zh-CN.js"></script>
+	<script type="text/javascript" src="../ui/i18n/jquery.ui.datepicker-zh-TW.js"></script>
 	<script type="text/javascript">
 	jQuery(function($) {
 		
diff --git a/demos/position/cycler.html b/demos/position/cycler.html
index 9bf90d9cce5..867273424ad 100644
--- a/demos/position/cycler.html
+++ b/demos/position/cycler.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Position - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.position.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
     
     <style type="text/css">
diff --git a/demos/position/default.html b/demos/position/default.html
index 81fe41a1c96..ceefe7c08eb 100644
--- a/demos/position/default.html
+++ b/demos/position/default.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Position - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.position.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
     
     <style type="text/css">
diff --git a/demos/progressbar/animated.html b/demos/progressbar/animated.html
index db013d924d2..127a0517a3b 100644
--- a/demos/progressbar/animated.html
+++ b/demos/progressbar/animated.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Progressbar - Animated</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.ui-progressbar-value { background-image: url(images/pbar-ani.gif); }
diff --git a/demos/progressbar/default.html b/demos/progressbar/default.html
index a06e6bf10c2..2743f0d3ccd 100644
--- a/demos/progressbar/default.html
+++ b/demos/progressbar/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Progressbar - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/progressbar/resize.html b/demos/progressbar/resize.html
index d1c53afed00..f15f213fc4b 100644
--- a/demos/progressbar/resize.html
+++ b/demos/progressbar/resize.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Progressbar - Resizable</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/removeClass/default.html b/demos/removeClass/default.html
index 83a8b896395..1027211f25a 100644
--- a/demos/removeClass/default.html
+++ b/demos/removeClass/default.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Effects - removeClass Demo</title>
 	<link type="text/css" href="http://jquery-ui.googlecode.com/svn/trunk/themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="http://jquery-ui.googlecode.com/svn/trunk/jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="http://jquery-ui.googlecode.com/svn/trunk/ui/effects.core.js"></script>
+	<script type="text/javascript" src="http://jquery-ui.googlecode.com/svn/trunk/ui/jquery.effects.core.js"></script>
 	<link type="text/css" href="http://jquery-ui.googlecode.com/svn/trunk/demos/demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; position: relative;}
diff --git a/demos/resizable/animate.html b/demos/resizable/animate.html
index 9af15481859..8eb991a3e78 100644
--- a/demos/resizable/animate.html
+++ b/demos/resizable/animate.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Animate</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable { width: 150px; height: 150px; padding: 0.5em; }
diff --git a/demos/resizable/aspect-ratio.html b/demos/resizable/aspect-ratio.html
index 56edad4e4df..7ca93e5bc07 100644
--- a/demos/resizable/aspect-ratio.html
+++ b/demos/resizable/aspect-ratio.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Preserve aspect ratio</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable { width: 160px; height: 90px; padding: 0.5em; }
diff --git a/demos/resizable/constrain-area.html b/demos/resizable/constrain-area.html
index e1a91227739..bd2755f8630 100644
--- a/demos/resizable/constrain-area.html
+++ b/demos/resizable/constrain-area.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Constrain resize area</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#container { width: 300px; height: 300px; }
diff --git a/demos/resizable/default.html b/demos/resizable/default.html
index 0b77b341a94..90aebdab0ba 100644
--- a/demos/resizable/default.html
+++ b/demos/resizable/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable { width: 150px; height: 150px; padding: 0.5em; }
diff --git a/demos/resizable/delay-start.html b/demos/resizable/delay-start.html
index df20f8ed654..5252f516ee1 100644
--- a/demos/resizable/delay-start.html
+++ b/demos/resizable/delay-start.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Delay start</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable, #resizable2 { width: 150px; height: 150px; padding: 0.5em; }
diff --git a/demos/resizable/helper.html b/demos/resizable/helper.html
index 49c46e73e67..acb9ea1c1da 100644
--- a/demos/resizable/helper.html
+++ b/demos/resizable/helper.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Helper</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable { width: 150px; height: 150px; padding: 0.5em; }
diff --git a/demos/resizable/max-min.html b/demos/resizable/max-min.html
index d29e4d7efa7..087b5bde38b 100644
--- a/demos/resizable/max-min.html
+++ b/demos/resizable/max-min.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Maximum / minimum size</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable { width: 200px; height: 150px; padding: 5px; }
diff --git a/demos/resizable/snap-to-grid.html b/demos/resizable/snap-to-grid.html
index f2adcc6bbf0..b1fe3a0fe0b 100644
--- a/demos/resizable/snap-to-grid.html
+++ b/demos/resizable/snap-to-grid.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Snap to grid</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable { width: 150px; height: 150px; padding: 0.5em; }
diff --git a/demos/resizable/synchronous-resize.html b/demos/resizable/synchronous-resize.html
index bd5de824c93..fd77687ca85 100644
--- a/demos/resizable/synchronous-resize.html
+++ b/demos/resizable/synchronous-resize.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Synchronous resize</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable { background-position: top left; }
diff --git a/demos/resizable/textarea.html b/demos/resizable/textarea.html
index 4374bc4fc35..0d77a9b1f15 100644
--- a/demos/resizable/textarea.html
+++ b/demos/resizable/textarea.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Textarea</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.ui-resizable-se {
diff --git a/demos/resizable/visual-feedback.html b/demos/resizable/visual-feedback.html
index c3edf9ad576..66088aca5b6 100644
--- a/demos/resizable/visual-feedback.html
+++ b/demos/resizable/visual-feedback.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable - Visual feedback</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#resizable { width: 150px; height: 150px; padding: 0.5em; }
diff --git a/demos/selectable/default.html b/demos/selectable/default.html
index 6a81f2bd738..d53b5d57108 100644
--- a/demos/selectable/default.html
+++ b/demos/selectable/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Selectable - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.selectable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	
 	<style type="text/css">
diff --git a/demos/selectable/display-grid.html b/demos/selectable/display-grid.html
index 3843c77b9f0..3fc48bf7201 100644
--- a/demos/selectable/display-grid.html
+++ b/demos/selectable/display-grid.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Selectable - Display as grid</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.selectable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	
 	<style type="text/css">
diff --git a/demos/selectable/serialize.html b/demos/selectable/serialize.html
index 0e201fa6a5e..32c53087690 100644
--- a/demos/selectable/serialize.html
+++ b/demos/selectable/serialize.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Selectable - Serialize</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.selectable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	
 	<style type="text/css">
diff --git a/demos/show/default.html b/demos/show/default.html
index 7c70526ab45..d45b0971ab2 100644
--- a/demos/show/default.html
+++ b/demos/show/default.html
@@ -4,19 +4,19 @@
 	<title>jQuery UI Effects - Show Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
-	<script type="text/javascript" src="../../ui/effects.blind.js"></script>
-	<script type="text/javascript" src="../../ui/effects.bounce.js"></script>
-	<script type="text/javascript" src="../../ui/effects.clip.js"></script>
-	<script type="text/javascript" src="../../ui/effects.drop.js"></script>
-	<script type="text/javascript" src="../../ui/effects.explode.js"></script>
-	<script type="text/javascript" src="../../ui/effects.fold.js"></script>
-	<script type="text/javascript" src="../../ui/effects.highlight.js"></script>
-	<script type="text/javascript" src="../../ui/effects.pulsate.js"></script>
-	<script type="text/javascript" src="../../ui/effects.scale.js"></script>
-	<script type="text/javascript" src="../../ui/effects.shake.js"></script>
-	<script type="text/javascript" src="../../ui/effects.slide.js"></script>
-	<script type="text/javascript" src="../../ui/effects.transfer.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.blind.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.bounce.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.clip.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.drop.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.fold.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.highlight.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.pulsate.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.scale.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.shake.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.slide.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.transfer.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; }
diff --git a/demos/slider/colorpicker.html b/demos/slider/colorpicker.html
index 0f7c264af17..ddd4c6a2b85 100644
--- a/demos/slider/colorpicker.html
+++ b/demos/slider/colorpicker.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Colorpicker</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#red, #green, #blue {
diff --git a/demos/slider/default.html b/demos/slider/default.html
index da92869a321..f6bfbcdbeeb 100644
--- a/demos/slider/default.html
+++ b/demos/slider/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; };
diff --git a/demos/slider/hotelrooms.html b/demos/slider/hotelrooms.html
index 93fc12b5ab8..04c938c967a 100644
--- a/demos/slider/hotelrooms.html
+++ b/demos/slider/hotelrooms.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Range with fixed minimum</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; };
diff --git a/demos/slider/multiple-vertical.html b/demos/slider/multiple-vertical.html
index 48258ccc98a..5947d045e03 100644
--- a/demos/slider/multiple-vertical.html
+++ b/demos/slider/multiple-vertical.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Multiple sliders</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; }
diff --git a/demos/slider/range-vertical.html b/demos/slider/range-vertical.html
index ad595114e3a..66ad34ea7c2 100644
--- a/demos/slider/range-vertical.html
+++ b/demos/slider/range-vertical.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Vertical range slider</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; };
diff --git a/demos/slider/range.html b/demos/slider/range.html
index 7c595e0b328..c2dd3332430 100644
--- a/demos/slider/range.html
+++ b/demos/slider/range.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Range slider</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; };
diff --git a/demos/slider/rangemax.html b/demos/slider/rangemax.html
index db266dba3ed..f5a2be346a7 100644
--- a/demos/slider/rangemax.html
+++ b/demos/slider/rangemax.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Range with fixed maximum</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; };
diff --git a/demos/slider/rangemin.html b/demos/slider/rangemin.html
index 4eebade2c70..1766b2c6d87 100644
--- a/demos/slider/rangemin.html
+++ b/demos/slider/rangemin.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Range with fixed minimum</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; };
diff --git a/demos/slider/side-scroll.html b/demos/slider/side-scroll.html
index 5357eb18cb6..b621e8e6a0e 100644
--- a/demos/slider/side-scroll.html
+++ b/demos/slider/side-scroll.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Slider scrollbar</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; }
diff --git a/demos/slider/slider-vertical.html b/demos/slider/slider-vertical.html
index 7731a4b953f..c42c0f0a902 100644
--- a/demos/slider/slider-vertical.html
+++ b/demos/slider/slider-vertical.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Vertical slider</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; };
diff --git a/demos/slider/steps.html b/demos/slider/steps.html
index f29b7346598..9623160a7af 100644
--- a/demos/slider/steps.html
+++ b/demos/slider/steps.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider - Snap to increments</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; };
diff --git a/demos/slider/tabs.html b/demos/slider/tabs.html
index b17d38a9dac..6201e49e560 100644
--- a/demos/slider/tabs.html
+++ b/demos/slider/tabs.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Slider - Snap to increments</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#demo-frame > div.demo { padding: 10px !important; }
diff --git a/demos/sortable/connect-lists-through-tabs.html b/demos/sortable/connect-lists-through-tabs.html
index 481c5065d32..07c85fcbb48 100644
--- a/demos/sortable/connect-lists-through-tabs.html
+++ b/demos/sortable/connect-lists-through-tabs.html
@@ -4,10 +4,10 @@
 	<title>jQuery UI Sortable - Connect lists with Tabs</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable1 li, #sortable2 li { margin: 0 5px 5px 5px; padding: 5px; font-size: 1.2em; width: 120px; }
diff --git a/demos/sortable/connect-lists.html b/demos/sortable/connect-lists.html
index 639f0e9f950..c7b165e739f 100644
--- a/demos/sortable/connect-lists.html
+++ b/demos/sortable/connect-lists.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable - Connect lists</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable1, #sortable2 { list-style-type: none; margin: 0; padding: 0; float: left; margin-right: 10px; }
diff --git a/demos/sortable/default.html b/demos/sortable/default.html
index 6df9ec13b35..779421bf5ed 100644
--- a/demos/sortable/default.html
+++ b/demos/sortable/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable { list-style-type: none; margin: 0; padding: 0; width: 60%; }
diff --git a/demos/sortable/delay-start.html b/demos/sortable/delay-start.html
index 636b7437bba..722136d4cc8 100644
--- a/demos/sortable/delay-start.html
+++ b/demos/sortable/delay-start.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable - Delay start</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable1, #sortable2 { list-style-type: none; margin: 0; padding: 0; margin-bottom: 15px;zoom: 1; }
diff --git a/demos/sortable/display-grid.html b/demos/sortable/display-grid.html
index e10cd99602b..80829d6d78e 100644
--- a/demos/sortable/display-grid.html
+++ b/demos/sortable/display-grid.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable - Display as grid</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable { list-style-type: none; margin: 0; padding: 0; }
diff --git a/demos/sortable/empty-lists.html b/demos/sortable/empty-lists.html
index 1886b8e00d2..986fc1dba78 100644
--- a/demos/sortable/empty-lists.html
+++ b/demos/sortable/empty-lists.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable - Handle empty lists</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable1, #sortable2, #sortable3 { list-style-type: none; margin: 0; padding: 0; float: left; margin-right: 10px; background: #eee; padding: 5px; width: 143px;}
diff --git a/demos/sortable/items.html b/demos/sortable/items.html
index 093631f2318..e1457b0a675 100644
--- a/demos/sortable/items.html
+++ b/demos/sortable/items.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable - Include / exclude items</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable1, #sortable2 { list-style-type: none; margin: 0; padding: 0; zoom: 1; }
diff --git a/demos/sortable/placeholder.html b/demos/sortable/placeholder.html
index 565eb0bff4d..94b3c5caba9 100644
--- a/demos/sortable/placeholder.html
+++ b/demos/sortable/placeholder.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable - Drop placeholder</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable { list-style-type: none; margin: 0; padding: 0; width: 60%; }
diff --git a/demos/sortable/portlets.html b/demos/sortable/portlets.html
index 5430989c64a..4494fa67392 100644
--- a/demos/sortable/portlets.html
+++ b/demos/sortable/portlets.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable - Portlets</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	.column { width: 170px; float: left; padding-bottom: 100px; }
diff --git a/demos/switchClass/default.html b/demos/switchClass/default.html
index 09b48c9dc9a..0e2f5822409 100644
--- a/demos/switchClass/default.html
+++ b/demos/switchClass/default.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Effects - switchClass Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; position: relative;}
diff --git a/demos/tabs/ajax.html b/demos/tabs/ajax.html
index ecbc2c591fd..724c52bb6dc 100644
--- a/demos/tabs/ajax.html
+++ b/demos/tabs/ajax.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Tabs - Content via Ajax</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/tabs/bottom.html b/demos/tabs/bottom.html
index 8232da29276..73d8d40ea90 100644
--- a/demos/tabs/bottom.html
+++ b/demos/tabs/bottom.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Tabs - Tabs at bottom</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/tabs/collapsible.html b/demos/tabs/collapsible.html
index eab85afa416..6ea5813d0b3 100644
--- a/demos/tabs/collapsible.html
+++ b/demos/tabs/collapsible.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Tabs - Collapse content</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/tabs/default.html b/demos/tabs/default.html
index 6048bc94e92..380bbbe255a 100644
--- a/demos/tabs/default.html
+++ b/demos/tabs/default.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Tabs - Default functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/tabs/manipulation.html b/demos/tabs/manipulation.html
index d1f6fe2a212..d4cac868915 100644
--- a/demos/tabs/manipulation.html
+++ b/demos/tabs/manipulation.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Tabs - Simple manipulation</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		#dialog label, #dialog input { display:block; }
diff --git a/demos/tabs/mouseover.html b/demos/tabs/mouseover.html
index 3232e1fd815..c24bb052989 100644
--- a/demos/tabs/mouseover.html
+++ b/demos/tabs/mouseover.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Tabs - Open on mouseover</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/tabs/sortable.html b/demos/tabs/sortable.html
index 1b0d458bdb9..61d249633d5 100644
--- a/demos/tabs/sortable.html
+++ b/demos/tabs/sortable.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Tabs - Sortable</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/tabs/vertical.html b/demos/tabs/vertical.html
index 56001c3747e..b94893b5efe 100644
--- a/demos/tabs/vertical.html
+++ b/demos/tabs/vertical.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Tabs - Vertical Tabs functionality</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
diff --git a/demos/toggle/default.html b/demos/toggle/default.html
index ffb464b3678..6342f154368 100644
--- a/demos/toggle/default.html
+++ b/demos/toggle/default.html
@@ -4,19 +4,19 @@
 	<title>jQuery UI Effects - Toggle Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
-	<script type="text/javascript" src="../../ui/effects.blind.js"></script>
-	<script type="text/javascript" src="../../ui/effects.bounce.js"></script>
-	<script type="text/javascript" src="../../ui/effects.clip.js"></script>
-	<script type="text/javascript" src="../../ui/effects.drop.js"></script>
-	<script type="text/javascript" src="../../ui/effects.explode.js"></script>
-	<script type="text/javascript" src="../../ui/effects.fold.js"></script>
-	<script type="text/javascript" src="../../ui/effects.highlight.js"></script>
-	<script type="text/javascript" src="../../ui/effects.pulsate.js"></script>
-	<script type="text/javascript" src="../../ui/effects.scale.js"></script>
-	<script type="text/javascript" src="../../ui/effects.shake.js"></script>
-	<script type="text/javascript" src="../../ui/effects.slide.js"></script>
-	<script type="text/javascript" src="../../ui/effects.transfer.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.blind.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.bounce.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.clip.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.drop.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.fold.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.highlight.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.pulsate.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.scale.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.shake.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.slide.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.transfer.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; }
diff --git a/demos/toggleClass/default.html b/demos/toggleClass/default.html
index 0bcfe2e7674..74a9fed4b33 100644
--- a/demos/toggleClass/default.html
+++ b/demos/toggleClass/default.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Effects - toggleClass Demo</title>
 	<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 		.toggler { width: 500px; height: 200px; position: relative;}
diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index dd4785544ec..d2e6c3c2b55 100644
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Accordion Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/all.html b/tests/unit/all.html
index b2d75e3d293..ec4d56eb789 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -5,18 +5,18 @@
 	<link rel="stylesheet" href="testsuite.css" type="text/css">
 
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.selectable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 
 	<script type="text/javascript" src="../../external/testrunner-r6574.js"></script>
 	<script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script>
diff --git a/tests/unit/all_2.html b/tests/unit/all_2.html
index 9ef1b1906c4..70f383b855a 100644
--- a/tests/unit/all_2.html
+++ b/tests/unit/all_2.html
@@ -5,7 +5,7 @@
 	<link rel="stylesheet" href="testsuite.css" type="text/css">
 
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
 
 	<script type="text/javascript">
 	var components = ["accordion","datepicker","dialog","draggable","progressbar","resizable","selectable","slider","sortable","tabs"];
@@ -39,17 +39,17 @@
 
 	</script>
 
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.selectable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 
 	<script type="text/javascript" src="../../external/testrunner-r6574.js"></script>
 	<script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script>
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index db231e8022c..73d0c382a48 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Core Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 13083f9e23b..5ba5f046d46 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -6,10 +6,10 @@
 	<link   type="text/css"       href="../../../themes/base/ui.base.css" rel="stylesheet" />
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../../../ui/i18n/ui.datepicker-fr.js"></script>
-	<script type="text/javascript" src="../../../ui/i18n/ui.datepicker-he.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-fr.js"></script>
+	<script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-he.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/defaults.html b/tests/unit/defaults.html
index d9afd0ed456..85b9f8265dd 100644
--- a/tests/unit/defaults.html
+++ b/tests/unit/defaults.html
@@ -4,18 +4,18 @@
 	<title>jQuery UI Defaults</title>
 
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.selectable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 
 	<link   type="text/css"       href="testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="testsuite.js"></script>
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index fe8908a76c1..f21db56c5aa 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -4,12 +4,12 @@
 	<title>jQuery UI Dialog Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index 01a5ebe8fe0..da761a10fec 100644
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Draggable Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index c549c4645e6..916fd460a86 100644
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -4,9 +4,9 @@
 	<title>jQuery UI Droppable Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/index.html b/tests/unit/index.html
index e5d3b379807..3da0dd7575f 100644
--- a/tests/unit/index.html
+++ b/tests/unit/index.html
@@ -7,18 +7,18 @@
 	<link   type="text/css"       href="testsuite.css" rel="stylesheet" />
 
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.selectable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 
 	<script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script>
 	<script type="text/javascript" src="../jquery.simulate.js"></script>
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 3f09ae32e2c..ce46f2377f2 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -4,7 +4,7 @@
 	<title>jQuery UI Position Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index e168c6ae316..8cf661ed42f 100644
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Progressbar Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.progressbar.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 0be2f854348..3fb4a4ce8ff 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Resizable Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index 93881ea75bf..7084ac7e5e2 100644
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Selectable Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.selectable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.selectable.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index 9d3d0603234..ae9e6d0b09c 100644
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Slider Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index c85cd1bde22..51174e99b95 100644
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Sortable Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 0baf6ce5aaa..a886d305ee8 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -4,8 +4,8 @@
 	<title>jQuery UI Tabs Test Suite</title>
 
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
 
 	<link   type="text/css"       href="../testsuite.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
diff --git a/tests/visual/accordion/accordion.html b/tests/visual/accordion/accordion.html
index f499f5aa277..6bfebf736e3 100644
--- a/tests/visual/accordion/accordion.html
+++ b/tests/visual/accordion/accordion.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion();
diff --git a/tests/visual/accordion/accordion_dl.html b/tests/visual/accordion/accordion_dl.html
index 4514af4d7b3..c19d420f109 100644
--- a/tests/visual/accordion/accordion_dl.html
+++ b/tests/visual/accordion/accordion_dl.html
@@ -6,8 +6,8 @@
 	<link rel="stylesheet" href="../../../themes/base/ui.base.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("dl").accordion()
diff --git a/tests/visual/accordion/accordion_method_destroy.html b/tests/visual/accordion/accordion_method_destroy.html
index 075f0d561b0..8c6018f984f 100644
--- a/tests/visual/accordion/accordion_method_destroy.html
+++ b/tests/visual/accordion/accordion_method_destroy.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion().accordion("destroy");
diff --git a/tests/visual/accordion/accordion_method_disable.html b/tests/visual/accordion/accordion_method_disable.html
index 42d387c03bd..c6143da24f8 100644
--- a/tests/visual/accordion/accordion_method_disable.html
+++ b/tests/visual/accordion/accordion_method_disable.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion().accordion("disable");
diff --git a/tests/visual/accordion/accordion_option_animated_bounceslide.html b/tests/visual/accordion/accordion_option_animated_bounceslide.html
index d9d2c8ddd2c..60f34e28daa 100644
--- a/tests/visual/accordion/accordion_option_animated_bounceslide.html
+++ b/tests/visual/accordion/accordion_option_animated_bounceslide.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.effects.core.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_option_animated_easeslide.html b/tests/visual/accordion/accordion_option_animated_easeslide.html
index 958c482997f..36036666e2b 100644
--- a/tests/visual/accordion/accordion_option_animated_easeslide.html
+++ b/tests/visual/accordion/accordion_option_animated_easeslide.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.effects.core.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_option_animated_false.html b/tests/visual/accordion/accordion_option_animated_false.html
index 89b709fcaab..a4e2460d743 100644
--- a/tests/visual/accordion/accordion_option_animated_false.html
+++ b/tests/visual/accordion/accordion_option_animated_false.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_option_animated_slide.html b/tests/visual/accordion/accordion_option_animated_slide.html
index 1c0cda251d9..fab8234667b 100644
--- a/tests/visual/accordion/accordion_option_animated_slide.html
+++ b/tests/visual/accordion/accordion_option_animated_slide.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_option_animated_true.html b/tests/visual/accordion/accordion_option_animated_true.html
index beec4ea958d..2e60c057799 100644
--- a/tests/visual/accordion/accordion_option_animated_true.html
+++ b/tests/visual/accordion/accordion_option_animated_true.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_option_autoHeight_false.html b/tests/visual/accordion/accordion_option_autoHeight_false.html
index 7dbd9e82591..785fdb09700 100644
--- a/tests/visual/accordion/accordion_option_autoHeight_false.html
+++ b/tests/visual/accordion/accordion_option_autoHeight_false.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_option_autoHeight_true.html b/tests/visual/accordion/accordion_option_autoHeight_true.html
index 14089a8bb55..bb95d57c12c 100644
--- a/tests/visual/accordion/accordion_option_autoHeight_true.html
+++ b/tests/visual/accordion/accordion_option_autoHeight_true.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_option_fillSpace_true.html b/tests/visual/accordion/accordion_option_fillSpace_true.html
index 477457adf3e..2fa19714800 100644
--- a/tests/visual/accordion/accordion_option_fillSpace_true.html
+++ b/tests/visual/accordion/accordion_option_fillSpace_true.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_option_navigation_true.html b/tests/visual/accordion/accordion_option_navigation_true.html
index d26c2e760f6..2be145c0141 100644
--- a/tests/visual/accordion/accordion_option_navigation_true.html
+++ b/tests/visual/accordion/accordion_option_navigation_true.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.effects.core.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_ticket_4322.html b/tests/visual/accordion/accordion_ticket_4322.html
index b428035904a..07c3561d675 100644
--- a/tests/visual/accordion/accordion_ticket_4322.html
+++ b/tests/visual/accordion/accordion_ticket_4322.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<style>
 		p {margin: .5em 0;}
 	</style>
diff --git a/tests/visual/accordion/accordion_ticket_4331.html b/tests/visual/accordion/accordion_ticket_4331.html
index f498a3ee7d6..1c8130f45eb 100644
--- a/tests/visual/accordion/accordion_ticket_4331.html
+++ b/tests/visual/accordion/accordion_ticket_4331.html
@@ -4,8 +4,8 @@
 	<title>Accordion Visual Test : Accordion ticket #4331</title>
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion();
diff --git a/tests/visual/accordion/accordion_ticket_4444.html b/tests/visual/accordion/accordion_ticket_4444.html
index 778af73bd81..c200e3d21ac 100644
--- a/tests/visual/accordion/accordion_ticket_4444.html
+++ b/tests/visual/accordion/accordion_ticket_4444.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({
diff --git a/tests/visual/accordion/accordion_ul.html b/tests/visual/accordion/accordion_ul.html
index b652a716501..b7cc678e89e 100644
--- a/tests/visual/accordion/accordion_ul.html
+++ b/tests/visual/accordion/accordion_ul.html
@@ -6,8 +6,8 @@
         <link rel="stylesheet" href="../../../themes/base/ui.base.css" type="text/css" />
         <link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" />
         <script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-        <script type="text/javascript" src="../../../ui/ui.core.js"></script>
-        <script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+        <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+        <script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
         <script type="text/javascript">
             $(function(){
                 $("#accordion").accordion()
diff --git a/tests/visual/accordion/default.html b/tests/visual/accordion/default.html
index eca5f8ed454..9ee1fee6f3c 100644
--- a/tests/visual/accordion/default.html
+++ b/tests/visual/accordion/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion();
diff --git a/tests/visual/all.html b/tests/visual/all.html
index b99eb4346c8..0aecd6fd071 100644
--- a/tests/visual/all.html
+++ b/tests/visual/all.html
@@ -5,18 +5,18 @@
 	<link rel="stylesheet" href="all.css" type="text/css">
 	<link rel="stylesheet" href="../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
-	<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.droppable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.progressbar.js"></script>
-	<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.selectable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.slider.js"></script>
-	<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#accordion").accordion({ header: "h3" });
diff --git a/tests/visual/animate/animate_backgroundColor_hex.html b/tests/visual/animate/animate_backgroundColor_hex.html
index 55c5ba8e6f3..e4f01b892f9 100644
--- a/tests/visual/animate/animate_backgroundColor_hex.html
+++ b/tests/visual/animate/animate_backgroundColor_hex.html
@@ -5,7 +5,7 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.effects.core.js"></script>
 	<script type="text/javascript">
 	function hexFromRGB (r, g, b) {
 		var hex = [
diff --git a/tests/visual/animate/animate_backgroundColor_rgb.html b/tests/visual/animate/animate_backgroundColor_rgb.html
index 8419d11133e..c951472a9af 100644
--- a/tests/visual/animate/animate_backgroundColor_rgb.html
+++ b/tests/visual/animate/animate_backgroundColor_rgb.html
@@ -5,7 +5,7 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.effects.core.js"></script>
 	<script type="text/javascript">
 	function randomColorRGB() {
 		return 'rgb('
diff --git a/tests/visual/animate/animate_color_hex.html b/tests/visual/animate/animate_color_hex.html
index decce8c9c12..fda95b7d7ac 100644
--- a/tests/visual/animate/animate_color_hex.html
+++ b/tests/visual/animate/animate_color_hex.html
@@ -5,7 +5,7 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.effects.core.js"></script>
 	<script type="text/javascript">
 	function hexFromRGB (r, g, b) {
 		var hex = [
diff --git a/tests/visual/animate/animate_color_rgb.html b/tests/visual/animate/animate_color_rgb.html
index 10904ac6caa..8c4c30583be 100644
--- a/tests/visual/animate/animate_color_rgb.html
+++ b/tests/visual/animate/animate_color_rgb.html
@@ -5,7 +5,7 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/effects.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.effects.core.js"></script>
 	<script type="text/javascript">
 	function randomColorRGB() {
 		return 'rgb('
diff --git a/tests/visual/compound/accordion_tabs.html b/tests/visual/compound/accordion_tabs.html
index 81b9e4d71ac..279b323351f 100644
--- a/tests/visual/compound/accordion_tabs.html
+++ b/tests/visual/compound/accordion_tabs.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$('#tabs').tabs();
diff --git a/tests/visual/compound/datepicker_dialog.html b/tests/visual/compound/datepicker_dialog.html
index a34babc6336..f0302752546 100644
--- a/tests/visual/compound/datepicker_dialog.html
+++ b/tests/visual/compound/datepicker_dialog.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.datepicker.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$('#datepicker').datepicker();
diff --git a/tests/visual/compound/draggable_accordion.html b/tests/visual/compound/draggable_accordion.html
index ba04e9729a8..98fdc6af87e 100644
--- a/tests/visual/compound/draggable_accordion.html
+++ b/tests/visual/compound/draggable_accordion.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$('#accordion').accordion();
diff --git a/tests/visual/compound/tabs_tabs.html b/tests/visual/compound/tabs_tabs.html
index 5d70a5cf542..2d4657d6392 100644
--- a/tests/visual/compound/tabs_tabs.html
+++ b/tests/visual/compound/tabs_tabs.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.accordion.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$('#tabs, #tabs-a, #tabs-b').tabs();
diff --git a/tests/visual/datepicker/datepicker.html b/tests/visual/datepicker/datepicker.html
index a18974a71cd..0027f209efe 100644
--- a/tests/visual/datepicker/datepicker.html
+++ b/tests/visual/datepicker/datepicker.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../all.css" type="text/css">
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		// simple datepicker
diff --git a/tests/visual/datepicker/datepicker_ticket_4240.html b/tests/visual/datepicker/datepicker_ticket_4240.html
index 95492ffd066..a8f60909ae0 100644
--- a/tests/visual/datepicker/datepicker_ticket_4240.html
+++ b/tests/visual/datepicker/datepicker_ticket_4240.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#destroystart").click(function() {
diff --git a/tests/visual/datepicker/default.html b/tests/visual/datepicker/default.html
index 7082c969cfa..077c867b540 100644
--- a/tests/visual/datepicker/default.html
+++ b/tests/visual/datepicker/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$('#datepicker').datepicker();
diff --git a/tests/visual/datepicker/multimonth.html b/tests/visual/datepicker/multimonth.html
index 9aeb7c3309c..39a2b7114cb 100644
--- a/tests/visual/datepicker/multimonth.html
+++ b/tests/visual/datepicker/multimonth.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.datepicker.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$('#datepicker').datepicker({numberOfMonths: [4,3], showButtonPanel: true });
diff --git a/tests/visual/datepicker/viewport.html b/tests/visual/datepicker/viewport.html
index 419d5703202..68e17bad064 100644
--- a/tests/visual/datepicker/viewport.html
+++ b/tests/visual/datepicker/viewport.html
@@ -16,8 +16,8 @@
 </style>
 <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 <script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-<script type="text/javascript" src="../../../ui/ui.datepicker.js"></script>
+<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+<script type="text/javascript" src="../../../ui/jquery.ui.datepicker.js"></script>
 <style type="text/css">
 label.error {
 	color: #ff4c00;
diff --git a/tests/visual/dialog/default.html b/tests/visual/dialog/default.html
index e466dff9d2a..fb6772ff83d 100644
--- a/tests/visual/dialog/default.html
+++ b/tests/visual/dialog/default.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog();
diff --git a/tests/visual/dialog/dialog.html b/tests/visual/dialog/dialog.html
index f638fca4194..ac8c4f4b1b2 100644
--- a/tests/visual/dialog/dialog.html
+++ b/tests/visual/dialog/dialog.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../all.css" type="text/css">
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		// Simple Dialog
diff --git a/tests/visual/dialog/dialog_on_page_with_large_dom.html b/tests/visual/dialog/dialog_on_page_with_large_dom.html
index 3c7075c60e3..983b756ad7b 100644
--- a/tests/visual/dialog/dialog_on_page_with_large_dom.html
+++ b/tests/visual/dialog/dialog_on_page_with_large_dom.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog({
diff --git a/tests/visual/dialog/dialog_on_page_with_scrollbars.html b/tests/visual/dialog/dialog_on_page_with_scrollbars.html
index ffc44726cc1..bab85b7bd9d 100644
--- a/tests/visual/dialog/dialog_on_page_with_scrollbars.html
+++ b/tests/visual/dialog/dialog_on_page_with_scrollbars.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog();
diff --git a/tests/visual/dialog/dialog_option_closeOnEscape_false.html b/tests/visual/dialog/dialog_option_closeOnEscape_false.html
index 90d7c2c2cab..a9f898ca312 100644
--- a/tests/visual/dialog/dialog_option_closeOnEscape_false.html
+++ b/tests/visual/dialog/dialog_option_closeOnEscape_false.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog({
diff --git a/tests/visual/dialog/dialog_option_closeOnEscape_true.html b/tests/visual/dialog/dialog_option_closeOnEscape_true.html
index f3882d9da98..116d7b0b075 100644
--- a/tests/visual/dialog/dialog_option_closeOnEscape_true.html
+++ b/tests/visual/dialog/dialog_option_closeOnEscape_true.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog({
diff --git a/tests/visual/dialog/dialog_option_modal_false.html b/tests/visual/dialog/dialog_option_modal_false.html
index 0bfc3ecc3b9..f89894c9f74 100644
--- a/tests/visual/dialog/dialog_option_modal_false.html
+++ b/tests/visual/dialog/dialog_option_modal_false.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog({
diff --git a/tests/visual/dialog/dialog_option_modal_true.html b/tests/visual/dialog/dialog_option_modal_true.html
index c1f7ecc9fae..84f6ee0b99a 100644
--- a/tests/visual/dialog/dialog_option_modal_true.html
+++ b/tests/visual/dialog/dialog_option_modal_true.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#dialog").dialog({
diff --git a/tests/visual/dialog/dialog_ticket_4826.html b/tests/visual/dialog/dialog_ticket_4826.html
index 267e862f768..4dbd56543c6 100644
--- a/tests/visual/dialog/dialog_ticket_4826.html
+++ b/tests/visual/dialog/dialog_ticket_4826.html
@@ -5,12 +5,12 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.position.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.stackfix.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		
diff --git a/tests/visual/draggable/default.html b/tests/visual/draggable/default.html
index 925631fa9bc..cad44f2baca 100644
--- a/tests/visual/draggable/default.html
+++ b/tests/visual/draggable/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").draggable();
diff --git a/tests/visual/draggable/draggable.html b/tests/visual/draggable/draggable.html
index 224640f2a60..d68eaec06c1 100644
--- a/tests/visual/draggable/draggable.html
+++ b/tests/visual/draggable/draggable.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggable").draggable();
diff --git a/tests/visual/draggable/draggable.scroll.html b/tests/visual/draggable/draggable.scroll.html
index a727860545b..fdc6fed3aff 100644
--- a/tests/visual/draggable/draggable.scroll.html
+++ b/tests/visual/draggable/draggable.scroll.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../all.css" type="text/css">
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
 	<style type="text/css">
 		.draggable {
 			width:100px;
diff --git a/tests/visual/draggable/draggable_option_containment_array.html b/tests/visual/draggable/draggable_option_containment_array.html
index 724a6bf3af6..2b777a9e0ec 100644
--- a/tests/visual/draggable/draggable_option_containment_array.html
+++ b/tests/visual/draggable/draggable_option_containment_array.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggable").draggable({
diff --git a/tests/visual/draggable/draggable_option_cursorAt_object.html b/tests/visual/draggable/draggable_option_cursorAt_object.html
index 6cd41e82864..bc8a31a903a 100644
--- a/tests/visual/draggable/draggable_option_cursorAt_object.html
+++ b/tests/visual/draggable/draggable_option_cursorAt_object.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggable").draggable({
diff --git a/tests/visual/draggable/draggable_option_handle_selector.html b/tests/visual/draggable/draggable_option_handle_selector.html
index 1c1e7088613..83bc90a0108 100644
--- a/tests/visual/draggable/draggable_option_handle_selector.html
+++ b/tests/visual/draggable/draggable_option_handle_selector.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggable").draggable({
diff --git a/tests/visual/draggable/draggable_option_iframeFix_false.html b/tests/visual/draggable/draggable_option_iframeFix_false.html
index 6e84192e677..2a3610ca8c6 100644
--- a/tests/visual/draggable/draggable_option_iframeFix_false.html
+++ b/tests/visual/draggable/draggable_option_iframeFix_false.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggable").draggable({
diff --git a/tests/visual/draggable/draggable_option_iframeFix_selector.html b/tests/visual/draggable/draggable_option_iframeFix_selector.html
index b1aba44d135..83128453606 100644
--- a/tests/visual/draggable/draggable_option_iframeFix_selector.html
+++ b/tests/visual/draggable/draggable_option_iframeFix_selector.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggable").draggable({
diff --git a/tests/visual/draggable/draggable_option_iframeFix_true.html b/tests/visual/draggable/draggable_option_iframeFix_true.html
index 4e44f91b4c6..bb5170de6ef 100644
--- a/tests/visual/draggable/draggable_option_iframeFix_true.html
+++ b/tests/visual/draggable/draggable_option_iframeFix_true.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggable").draggable({
diff --git a/tests/visual/droppable/default.html b/tests/visual/droppable/default.html
index 1afc1acfaf5..c56b25c4d24 100644
--- a/tests/visual/droppable/default.html
+++ b/tests/visual/droppable/default.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").droppable();
diff --git a/tests/visual/droppable/droppable.html b/tests/visual/droppable/droppable.html
index f1728d3ea50..2bb70ec1340 100644
--- a/tests/visual/droppable/droppable.html
+++ b/tests/visual/droppable/droppable.html
@@ -5,9 +5,9 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#droppable").droppable();
diff --git a/tests/visual/droppable/droppable_option_accept_default.html b/tests/visual/droppable/droppable_option_accept_default.html
index b16fd6d9d3d..01bad871d1f 100644
--- a/tests/visual/droppable/droppable_option_accept_default.html
+++ b/tests/visual/droppable/droppable_option_accept_default.html
@@ -6,9 +6,9 @@
 	<link rel="stylesheet" href="droppable.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggables *").draggable({
diff --git a/tests/visual/droppable/droppable_option_accept_function.html b/tests/visual/droppable/droppable_option_accept_function.html
index d3e15b5afac..9852b888c34 100644
--- a/tests/visual/droppable/droppable_option_accept_function.html
+++ b/tests/visual/droppable/droppable_option_accept_function.html
@@ -6,9 +6,9 @@
 	<link rel="stylesheet" href="droppable.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggables *").draggable({
diff --git a/tests/visual/droppable/droppable_option_accept_selector.html b/tests/visual/droppable/droppable_option_accept_selector.html
index 688215fed17..f747330e640 100644
--- a/tests/visual/droppable/droppable_option_accept_selector.html
+++ b/tests/visual/droppable/droppable_option_accept_selector.html
@@ -6,9 +6,9 @@
 	<link rel="stylesheet" href="droppable.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#draggables *").draggable({
diff --git a/tests/visual/droppable/droppable_ticket_4087.html b/tests/visual/droppable/droppable_ticket_4087.html
index 57a991e77a2..4e0b5fb116e 100644
--- a/tests/visual/droppable/droppable_ticket_4087.html
+++ b/tests/visual/droppable/droppable_ticket_4087.html
@@ -4,9 +4,9 @@
 	<title>Droppable Visual Test - Droppable ticket 4087</title>
 	<link type="text/css" href="../../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; }
diff --git a/tests/visual/droppable/droppable_ticket_4088.html b/tests/visual/droppable/droppable_ticket_4088.html
index 89fdfa1e29c..28287fadc71 100644
--- a/tests/visual/droppable/droppable_ticket_4088.html
+++ b/tests/visual/droppable/droppable_ticket_4088.html
@@ -4,9 +4,9 @@
 	<title>Droppable Visual Test - Droppable ticket 4088</title>
 	<link type="text/css" href="../../../themes/base/ui.all.css" rel="stylesheet" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.droppable.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<style type="text/css">
 	#sortable { list-style-type: none; margin: 0; padding: 0; width: 60%; }
diff --git a/tests/visual/effects.all.html b/tests/visual/effects.all.html
index f9994786763..be1ea8dc59f 100644
--- a/tests/visual/effects.all.html
+++ b/tests/visual/effects.all.html
@@ -4,19 +4,19 @@
 	<title>jQuery UI Effects Test Suite</title>
 	<link rel="stylesheet" href="effects.all.css" type="text/css" />
 	<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../ui/effects.core.js"></script>
-	<script type="text/javascript" src="../../ui/effects.blind.js"></script>
-	<script type="text/javascript" src="../../ui/effects.bounce.js"></script>
-	<script type="text/javascript" src="../../ui/effects.clip.js"></script>
-	<script type="text/javascript" src="../../ui/effects.drop.js"></script>
-	<script type="text/javascript" src="../../ui/effects.explode.js"></script>
-	<script type="text/javascript" src="../../ui/effects.fold.js"></script>
-	<script type="text/javascript" src="../../ui/effects.highlight.js"></script>
-	<script type="text/javascript" src="../../ui/effects.pulsate.js"></script>
-	<script type="text/javascript" src="../../ui/effects.scale.js"></script>
-	<script type="text/javascript" src="../../ui/effects.shake.js"></script>
-	<script type="text/javascript" src="../../ui/effects.slide.js"></script>
-	<script type="text/javascript" src="../../ui/effects.transfer.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.core.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.blind.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.bounce.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.clip.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.drop.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.fold.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.highlight.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.pulsate.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.scale.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.shake.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.slide.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.effects.transfer.js"></script>
 	<script type="text/javascript" src="effects.all.js"></script>
 </head>
 <body>
diff --git a/tests/visual/progressbar/default.html b/tests/visual/progressbar/default.html
index 326e8922a5a..acd63cf69ed 100644
--- a/tests/visual/progressbar/default.html
+++ b/tests/visual/progressbar/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.progressbar.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#progressbar").progressbar();
diff --git a/tests/visual/progressbar/progressbar.html b/tests/visual/progressbar/progressbar.html
index b3309e053a4..d79bef6871d 100644
--- a/tests/visual/progressbar/progressbar.html
+++ b/tests/visual/progressbar/progressbar.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../all.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.progressbar.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.progressbar.js"></script>
 	<script type="text/javascript">
 		$(function() {
 			$("#progressbar").progressbar({ value: 37 });
diff --git a/tests/visual/resizable/default.html b/tests/visual/resizable/default.html
index 9a122f6b19f..f9319019823 100644
--- a/tests/visual/resizable/default.html
+++ b/tests/visual/resizable/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable();
diff --git a/tests/visual/resizable/resizable.html b/tests/visual/resizable/resizable.html
index 1063d926a67..0b946529e64 100644
--- a/tests/visual/resizable/resizable.html
+++ b/tests/visual/resizable/resizable.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable();
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_0.5.html b/tests/visual/resizable/resizable_option_aspectRatio_0.5.html
index a2b8989f7c4..59f732d79ea 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_0.5.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_0.5.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_1.0.html b/tests/visual/resizable/resizable_option_aspectRatio_1.0.html
index ceb464ec0f9..a821550af9a 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_1.0.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_1.0.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_1.5.html b/tests/visual/resizable/resizable_option_aspectRatio_1.5.html
index 18a796750de..2b7be71caa4 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_1.5.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_1.5.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_preserve_maxHeight_150.html b/tests/visual/resizable/resizable_option_aspectRatio_preserve_maxHeight_150.html
index 6b0b8a7a9e3..8cd900894ee 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_preserve_maxHeight_150.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_preserve_maxHeight_150.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_preserve_maxWidth_150.html b/tests/visual/resizable/resizable_option_aspectRatio_preserve_maxWidth_150.html
index 0d3e519d56e..2e922ceb067 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_preserve_maxWidth_150.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_preserve_maxWidth_150.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_preserve_minHeight_50.html b/tests/visual/resizable/resizable_option_aspectRatio_preserve_minHeight_50.html
index a324e294568..abbf6fd844d 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_preserve_minHeight_50.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_preserve_minHeight_50.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_preserve_minWidth_50.html b/tests/visual/resizable/resizable_option_aspectRatio_preserve_minWidth_50.html
index 5cd6c2f9288..3c5b21cf441 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_preserve_minWidth_50.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_preserve_minWidth_50.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh100.html b/tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh100.html
index dbc3670b0cb..e461671d2e4 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh100.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh100.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh50.html b/tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh50.html
index 5a553f540c1..b8a8268baaf 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh50.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_preserve_w100xh50.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_option_aspectRatio_preserve_w50xh100.html b/tests/visual/resizable/resizable_option_aspectRatio_preserve_w50xh100.html
index 775c1f82141..d7e6cace1c0 100644
--- a/tests/visual/resizable/resizable_option_aspectRatio_preserve_w50xh100.html
+++ b/tests/visual/resizable/resizable_option_aspectRatio_preserve_w50xh100.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_ticket_3053.html b/tests/visual/resizable/resizable_ticket_3053.html
index 9ceb21f219e..541d8fb0132 100644
--- a/tests/visual/resizable/resizable_ticket_3053.html
+++ b/tests/visual/resizable/resizable_ticket_3053.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_ticket_4199.html b/tests/visual/resizable/resizable_ticket_4199.html
index 8cd7c3d4033..50c038eda57 100644
--- a/tests/visual/resizable/resizable_ticket_4199.html
+++ b/tests/visual/resizable/resizable_ticket_4199.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/resizable/resizable_ticket_4217.html b/tests/visual/resizable/resizable_ticket_4217.html
index 18fd8eb64f5..b600bc06322 100644
--- a/tests/visual/resizable/resizable_ticket_4217.html
+++ b/tests/visual/resizable/resizable_ticket_4217.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#resizable").resizable({
diff --git a/tests/visual/selectable/default.html b/tests/visual/selectable/default.html
index e2273830632..1d0d06ef0a3 100644
--- a/tests/visual/selectable/default.html
+++ b/tests/visual/selectable/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.selectable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.selectable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#selectable").selectable();
diff --git a/tests/visual/selectable/selectable.html b/tests/visual/selectable/selectable.html
index 546bb0d72fa..995fa1ae539 100644
--- a/tests/visual/selectable/selectable.html
+++ b/tests/visual/selectable/selectable.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../all.css" type="text/css">
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.selectable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.selectable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#selectable").selectable();
diff --git a/tests/visual/selectable/selectable_ticket_4341.html b/tests/visual/selectable/selectable_ticket_4341.html
index 75b795aff4f..c763fa99847 100644
--- a/tests/visual/selectable/selectable_ticket_4341.html
+++ b/tests/visual/selectable/selectable_ticket_4341.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.selectable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.selectable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#selectable").selectable({
diff --git a/tests/visual/slider/default.html b/tests/visual/slider/default.html
index dc57608b765..37059c15581 100644
--- a/tests/visual/slider/default.html
+++ b/tests/visual/slider/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider();
diff --git a/tests/visual/slider/default_vertical.html b/tests/visual/slider/default_vertical.html
index e0e5618be46..8cceb981bee 100644
--- a/tests/visual/slider/default_vertical.html
+++ b/tests/visual/slider/default_vertical.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/slider/slider.html b/tests/visual/slider/slider.html
index 0e76034a6af..c54be6b438e 100644
--- a/tests/visual/slider/slider.html
+++ b/tests/visual/slider/slider.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../all.css" type="text/css">
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider1").slider();
diff --git a/tests/visual/slider/slider_horizontal.html b/tests/visual/slider/slider_horizontal.html
index fb6fe1027ab..64ac203fba2 100644
--- a/tests/visual/slider/slider_horizontal.html
+++ b/tests/visual/slider/slider_horizontal.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/slider/slider_horizontal_range.html b/tests/visual/slider/slider_horizontal_range.html
index 182e27a1a77..07c293f99dd 100644
--- a/tests/visual/slider/slider_horizontal_range.html
+++ b/tests/visual/slider/slider_horizontal_range.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/slider/slider_horizontal_range_max.html b/tests/visual/slider/slider_horizontal_range_max.html
index 68fd374a49c..260d722afb5 100644
--- a/tests/visual/slider/slider_horizontal_range_max.html
+++ b/tests/visual/slider/slider_horizontal_range_max.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/slider/slider_horizontal_range_min.html b/tests/visual/slider/slider_horizontal_range_min.html
index cbf2d7f36c0..c67989dc9ea 100644
--- a/tests/visual/slider/slider_horizontal_range_min.html
+++ b/tests/visual/slider/slider_horizontal_range_min.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/slider/slider_in_container_with_scrollbars.html b/tests/visual/slider/slider_in_container_with_scrollbars.html
index f933eeda31a..50b7d3d666e 100644
--- a/tests/visual/slider/slider_in_container_with_scrollbars.html
+++ b/tests/visual/slider/slider_in_container_with_scrollbars.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({ value: 50 });
diff --git a/tests/visual/slider/slider_method_destroy.html b/tests/visual/slider/slider_method_destroy.html
index 4d827cf6a14..e612d5abb7e 100644
--- a/tests/visual/slider/slider_method_destroy.html
+++ b/tests/visual/slider/slider_method_destroy.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_method_disable.html b/tests/visual/slider/slider_method_disable.html
index 1bc6ef59c7d..9549fcf0828 100644
--- a/tests/visual/slider/slider_method_disable.html
+++ b/tests/visual/slider/slider_method_disable.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_animate_false.html b/tests/visual/slider/slider_option_animate_false.html
index ac1f195fc95..ff384fc18c3 100644
--- a/tests/visual/slider/slider_option_animate_false.html
+++ b/tests/visual/slider/slider_option_animate_false.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_animate_true.html b/tests/visual/slider/slider_option_animate_true.html
index 476b9581af9..40bbb55b64e 100644
--- a/tests/visual/slider/slider_option_animate_true.html
+++ b/tests/visual/slider/slider_option_animate_true.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_max_3.html b/tests/visual/slider/slider_option_max_3.html
index d6fc81250eb..672d25929b7 100644
--- a/tests/visual/slider/slider_option_max_3.html
+++ b/tests/visual/slider/slider_option_max_3.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_max_30.html b/tests/visual/slider/slider_option_max_30.html
index e638bbc7417..a845415fba2 100644
--- a/tests/visual/slider/slider_option_max_30.html
+++ b/tests/visual/slider/slider_option_max_30.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_max_300.html b/tests/visual/slider/slider_option_max_300.html
index 64b71ce6a0e..b85459fa0e5 100644
--- a/tests/visual/slider/slider_option_max_300.html
+++ b/tests/visual/slider/slider_option_max_300.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_min_-3.html b/tests/visual/slider/slider_option_min_-3.html
index 3868192f9d1..ce2f083970c 100644
--- a/tests/visual/slider/slider_option_min_-3.html
+++ b/tests/visual/slider/slider_option_min_-3.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_min_-30.html b/tests/visual/slider/slider_option_min_-30.html
index acd0c935e36..b5adac9aea5 100644
--- a/tests/visual/slider/slider_option_min_-30.html
+++ b/tests/visual/slider/slider_option_min_-30.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_min_-300.html b/tests/visual/slider/slider_option_min_-300.html
index af440acde81..196d9bb6252 100644
--- a/tests/visual/slider/slider_option_min_-300.html
+++ b/tests/visual/slider/slider_option_min_-300.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_orientation_horizontal.html b/tests/visual/slider/slider_option_orientation_horizontal.html
index 69c8f030527..6611e8e9cc3 100644
--- a/tests/visual/slider/slider_option_orientation_horizontal.html
+++ b/tests/visual/slider/slider_option_orientation_horizontal.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_orientation_vertical.html b/tests/visual/slider/slider_option_orientation_vertical.html
index e8390417d4e..fbbc15ba90d 100644
--- a/tests/visual/slider/slider_option_orientation_vertical.html
+++ b/tests/visual/slider/slider_option_orientation_vertical.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_range_false.html b/tests/visual/slider/slider_option_range_false.html
index 9cf2a523ea3..77a2e5408cf 100644
--- a/tests/visual/slider/slider_option_range_false.html
+++ b/tests/visual/slider/slider_option_range_false.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_range_max.html b/tests/visual/slider/slider_option_range_max.html
index f78c79af1d8..ca2cc542e44 100644
--- a/tests/visual/slider/slider_option_range_max.html
+++ b/tests/visual/slider/slider_option_range_max.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_range_min.html b/tests/visual/slider/slider_option_range_min.html
index 3af2c6f873e..e1af917b259 100644
--- a/tests/visual/slider/slider_option_range_min.html
+++ b/tests/visual/slider/slider_option_range_min.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_range_true.html b/tests/visual/slider/slider_option_range_true.html
index 230cedd51c9..54741bd4170 100644
--- a/tests/visual/slider/slider_option_range_true.html
+++ b/tests/visual/slider/slider_option_range_true.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_step_25.html b/tests/visual/slider/slider_option_step_25.html
index f92d13ea651..b50f6a324e3 100644
--- a/tests/visual/slider/slider_option_step_25.html
+++ b/tests/visual/slider/slider_option_step_25.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_step_5.html b/tests/visual/slider/slider_option_step_5.html
index bdecb3aba87..d34f24c5f02 100644
--- a/tests/visual/slider/slider_option_step_5.html
+++ b/tests/visual/slider/slider_option_step_5.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_value_3.html b/tests/visual/slider/slider_option_value_3.html
index 52e6a9d2a24..625ca7593f6 100644
--- a/tests/visual/slider/slider_option_value_3.html
+++ b/tests/visual/slider/slider_option_value_3.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_value_30.html b/tests/visual/slider/slider_option_value_30.html
index 80e6c041eb9..eb0b86c3d0c 100644
--- a/tests/visual/slider/slider_option_value_30.html
+++ b/tests/visual/slider/slider_option_value_30.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_values_25_50_75.html b/tests/visual/slider/slider_option_values_25_50_75.html
index f5cb5021d0b..ad10165c8fa 100644
--- a/tests/visual/slider/slider_option_values_25_50_75.html
+++ b/tests/visual/slider/slider_option_values_25_50_75.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_values_25_75.html b/tests/visual/slider/slider_option_values_25_75.html
index c47a6320d63..4bc4a1c8a53 100644
--- a/tests/visual/slider/slider_option_values_25_75.html
+++ b/tests/visual/slider/slider_option_values_25_75.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_option_values_50.html b/tests/visual/slider/slider_option_values_50.html
index 193fda94aec..dbe011b0734 100644
--- a/tests/visual/slider/slider_option_values_50.html
+++ b/tests/visual/slider/slider_option_values_50.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_ticket_3736.html b/tests/visual/slider/slider_ticket_3736.html
index 5560edcec6a..e178a551b08 100644
--- a/tests/visual/slider/slider_ticket_3736.html
+++ b/tests/visual/slider/slider_ticket_3736.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_ticket_3762.html b/tests/visual/slider/slider_ticket_3762.html
index 9eee9c2276f..c0712219a3c 100644
--- a/tests/visual/slider/slider_ticket_3762.html
+++ b/tests/visual/slider/slider_ticket_3762.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({ values: [5,0], range: true});
diff --git a/tests/visual/slider/slider_ticket_4385.html b/tests/visual/slider/slider_ticket_4385.html
index 7a7456abb66..b60d3980758 100644
--- a/tests/visual/slider/slider_ticket_4385.html
+++ b/tests/visual/slider/slider_ticket_4385.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#slider").slider({
diff --git a/tests/visual/slider/slider_vertical.html b/tests/visual/slider/slider_vertical.html
index 5ec02be21c3..b38e932dbd7 100644
--- a/tests/visual/slider/slider_vertical.html
+++ b/tests/visual/slider/slider_vertical.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/slider/slider_vertical_range.html b/tests/visual/slider/slider_vertical_range.html
index d59fd5f5789..96f8564236f 100644
--- a/tests/visual/slider/slider_vertical_range.html
+++ b/tests/visual/slider/slider_vertical_range.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/slider/slider_vertical_range_max.html b/tests/visual/slider/slider_vertical_range_max.html
index d68eae58564..feb4ab52ee4 100644
--- a/tests/visual/slider/slider_vertical_range_max.html
+++ b/tests/visual/slider/slider_vertical_range_max.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/slider/slider_vertical_range_min.html b/tests/visual/slider/slider_vertical_range_min.html
index 5ce2c2a4d98..b3c27422359 100644
--- a/tests/visual/slider/slider_vertical_range_min.html
+++ b/tests/visual/slider/slider_vertical_range_min.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").slider({
diff --git a/tests/visual/sortable/default.html b/tests/visual/sortable/default.html
index 0af09ffd49d..78c36c5e45f 100644
--- a/tests/visual/sortable/default.html
+++ b/tests/visual/sortable/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("body").children(":first").sortable();
diff --git a/tests/visual/sortable/sortable.html b/tests/visual/sortable/sortable.html
index 039ebe80af1..069fb362489 100644
--- a/tests/visual/sortable/sortable.html
+++ b/tests/visual/sortable/sortable.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../all.css" type="text/css">
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#sortable").sortable();
diff --git a/tests/visual/sortable/sortable_massive_scale.html b/tests/visual/sortable/sortable_massive_scale.html
index 47a02bc9a2d..3c5a8acaacd 100644
--- a/tests/visual/sortable/sortable_massive_scale.html
+++ b/tests/visual/sortable/sortable_massive_scale.html
@@ -4,9 +4,9 @@
 	<title>Sortable Massive Scale Test</title>
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script>
 	<style>
 		ul {
 			list-style: none;
diff --git a/tests/visual/sortable/sortable_option_revert_false.html b/tests/visual/sortable/sortable_option_revert_false.html
index fe6c4d3e861..2ade1c9a98f 100644
--- a/tests/visual/sortable/sortable_option_revert_false.html
+++ b/tests/visual/sortable/sortable_option_revert_false.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#sortable").sortable({
diff --git a/tests/visual/sortable/sortable_option_revert_true.html b/tests/visual/sortable/sortable_option_revert_true.html
index bb3cb24e592..37f4a733b9c 100644
--- a/tests/visual/sortable/sortable_option_revert_true.html
+++ b/tests/visual/sortable/sortable_option_revert_true.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css" />
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#sortable").sortable({
diff --git a/tests/visual/sortable/sortable_ticket_4551.html b/tests/visual/sortable/sortable_ticket_4551.html
index ba61e244a7d..9f83d3908ff 100644
--- a/tests/visual/sortable/sortable_ticket_4551.html
+++ b/tests/visual/sortable/sortable_ticket_4551.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.sortable.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#first, #second").sortable({
diff --git a/tests/visual/tabs/default.html b/tests/visual/tabs/default.html
index 8257517fefd..57f31b278b5 100644
--- a/tests/visual/tabs/default.html
+++ b/tests/visual/tabs/default.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../visual.css" type="text/css" />
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#tabs").tabs();
diff --git a/tests/visual/tabs/tabs.html b/tests/visual/tabs/tabs.html
index 40036b9753d..02b11475b6f 100644
--- a/tests/visual/tabs/tabs.html
+++ b/tests/visual/tabs/tabs.html
@@ -5,8 +5,8 @@
 	<link rel="stylesheet" href="../all.css" type="text/css">
 	<link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css">
 	<script type="text/javascript" src="../../../jquery-1.3.2.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.core.js"></script>
-	<script type="text/javascript" src="../../../ui/ui.tabs.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script>
+	<script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script>
 	<script type="text/javascript">
 	$(function() {
 		$("#tabs").tabs();
diff --git a/ui/i18n/ui.datepicker-ar.js b/ui/i18n/jquery.ui.datepicker-ar.js
similarity index 100%
rename from ui/i18n/ui.datepicker-ar.js
rename to ui/i18n/jquery.ui.datepicker-ar.js
diff --git a/ui/i18n/ui.datepicker-az.js b/ui/i18n/jquery.ui.datepicker-az.js
similarity index 100%
rename from ui/i18n/ui.datepicker-az.js
rename to ui/i18n/jquery.ui.datepicker-az.js
diff --git a/ui/i18n/ui.datepicker-bg.js b/ui/i18n/jquery.ui.datepicker-bg.js
similarity index 100%
rename from ui/i18n/ui.datepicker-bg.js
rename to ui/i18n/jquery.ui.datepicker-bg.js
diff --git a/ui/i18n/ui.datepicker-ca.js b/ui/i18n/jquery.ui.datepicker-ca.js
similarity index 100%
rename from ui/i18n/ui.datepicker-ca.js
rename to ui/i18n/jquery.ui.datepicker-ca.js
diff --git a/ui/i18n/ui.datepicker-cs.js b/ui/i18n/jquery.ui.datepicker-cs.js
similarity index 100%
rename from ui/i18n/ui.datepicker-cs.js
rename to ui/i18n/jquery.ui.datepicker-cs.js
diff --git a/ui/i18n/ui.datepicker-da.js b/ui/i18n/jquery.ui.datepicker-da.js
similarity index 100%
rename from ui/i18n/ui.datepicker-da.js
rename to ui/i18n/jquery.ui.datepicker-da.js
diff --git a/ui/i18n/ui.datepicker-de.js b/ui/i18n/jquery.ui.datepicker-de.js
similarity index 100%
rename from ui/i18n/ui.datepicker-de.js
rename to ui/i18n/jquery.ui.datepicker-de.js
diff --git a/ui/i18n/ui.datepicker-el.js b/ui/i18n/jquery.ui.datepicker-el.js
similarity index 100%
rename from ui/i18n/ui.datepicker-el.js
rename to ui/i18n/jquery.ui.datepicker-el.js
diff --git a/ui/i18n/ui.datepicker-eo.js b/ui/i18n/jquery.ui.datepicker-eo.js
similarity index 100%
rename from ui/i18n/ui.datepicker-eo.js
rename to ui/i18n/jquery.ui.datepicker-eo.js
diff --git a/ui/i18n/ui.datepicker-es.js b/ui/i18n/jquery.ui.datepicker-es.js
similarity index 100%
rename from ui/i18n/ui.datepicker-es.js
rename to ui/i18n/jquery.ui.datepicker-es.js
diff --git a/ui/i18n/ui.datepicker-et.js b/ui/i18n/jquery.ui.datepicker-et.js
similarity index 100%
rename from ui/i18n/ui.datepicker-et.js
rename to ui/i18n/jquery.ui.datepicker-et.js
diff --git a/ui/i18n/ui.datepicker-eu.js b/ui/i18n/jquery.ui.datepicker-eu.js
similarity index 100%
rename from ui/i18n/ui.datepicker-eu.js
rename to ui/i18n/jquery.ui.datepicker-eu.js
diff --git a/ui/i18n/ui.datepicker-fa.js b/ui/i18n/jquery.ui.datepicker-fa.js
similarity index 100%
rename from ui/i18n/ui.datepicker-fa.js
rename to ui/i18n/jquery.ui.datepicker-fa.js
diff --git a/ui/i18n/ui.datepicker-fi.js b/ui/i18n/jquery.ui.datepicker-fi.js
similarity index 100%
rename from ui/i18n/ui.datepicker-fi.js
rename to ui/i18n/jquery.ui.datepicker-fi.js
diff --git a/ui/i18n/ui.datepicker-fr-CH.js b/ui/i18n/jquery.ui.datepicker-fr-CH.js
similarity index 100%
rename from ui/i18n/ui.datepicker-fr-CH.js
rename to ui/i18n/jquery.ui.datepicker-fr-CH.js
diff --git a/ui/i18n/ui.datepicker-fr.js b/ui/i18n/jquery.ui.datepicker-fr.js
similarity index 100%
rename from ui/i18n/ui.datepicker-fr.js
rename to ui/i18n/jquery.ui.datepicker-fr.js
diff --git a/ui/i18n/ui.datepicker-he.js b/ui/i18n/jquery.ui.datepicker-he.js
similarity index 100%
rename from ui/i18n/ui.datepicker-he.js
rename to ui/i18n/jquery.ui.datepicker-he.js
diff --git a/ui/i18n/ui.datepicker-hr.js b/ui/i18n/jquery.ui.datepicker-hr.js
similarity index 100%
rename from ui/i18n/ui.datepicker-hr.js
rename to ui/i18n/jquery.ui.datepicker-hr.js
diff --git a/ui/i18n/ui.datepicker-hu.js b/ui/i18n/jquery.ui.datepicker-hu.js
similarity index 100%
rename from ui/i18n/ui.datepicker-hu.js
rename to ui/i18n/jquery.ui.datepicker-hu.js
diff --git a/ui/i18n/ui.datepicker-hy.js b/ui/i18n/jquery.ui.datepicker-hy.js
similarity index 100%
rename from ui/i18n/ui.datepicker-hy.js
rename to ui/i18n/jquery.ui.datepicker-hy.js
diff --git a/ui/i18n/ui.datepicker-id.js b/ui/i18n/jquery.ui.datepicker-id.js
similarity index 100%
rename from ui/i18n/ui.datepicker-id.js
rename to ui/i18n/jquery.ui.datepicker-id.js
diff --git a/ui/i18n/ui.datepicker-is.js b/ui/i18n/jquery.ui.datepicker-is.js
similarity index 100%
rename from ui/i18n/ui.datepicker-is.js
rename to ui/i18n/jquery.ui.datepicker-is.js
diff --git a/ui/i18n/ui.datepicker-it.js b/ui/i18n/jquery.ui.datepicker-it.js
similarity index 100%
rename from ui/i18n/ui.datepicker-it.js
rename to ui/i18n/jquery.ui.datepicker-it.js
diff --git a/ui/i18n/ui.datepicker-ja.js b/ui/i18n/jquery.ui.datepicker-ja.js
similarity index 100%
rename from ui/i18n/ui.datepicker-ja.js
rename to ui/i18n/jquery.ui.datepicker-ja.js
diff --git a/ui/i18n/ui.datepicker-ko.js b/ui/i18n/jquery.ui.datepicker-ko.js
similarity index 100%
rename from ui/i18n/ui.datepicker-ko.js
rename to ui/i18n/jquery.ui.datepicker-ko.js
diff --git a/ui/i18n/ui.datepicker-lt.js b/ui/i18n/jquery.ui.datepicker-lt.js
similarity index 100%
rename from ui/i18n/ui.datepicker-lt.js
rename to ui/i18n/jquery.ui.datepicker-lt.js
diff --git a/ui/i18n/ui.datepicker-lv.js b/ui/i18n/jquery.ui.datepicker-lv.js
similarity index 100%
rename from ui/i18n/ui.datepicker-lv.js
rename to ui/i18n/jquery.ui.datepicker-lv.js
diff --git a/ui/i18n/ui.datepicker-ms.js b/ui/i18n/jquery.ui.datepicker-ms.js
similarity index 100%
rename from ui/i18n/ui.datepicker-ms.js
rename to ui/i18n/jquery.ui.datepicker-ms.js
diff --git a/ui/i18n/ui.datepicker-nl.js b/ui/i18n/jquery.ui.datepicker-nl.js
similarity index 100%
rename from ui/i18n/ui.datepicker-nl.js
rename to ui/i18n/jquery.ui.datepicker-nl.js
diff --git a/ui/i18n/ui.datepicker-no.js b/ui/i18n/jquery.ui.datepicker-no.js
similarity index 100%
rename from ui/i18n/ui.datepicker-no.js
rename to ui/i18n/jquery.ui.datepicker-no.js
diff --git a/ui/i18n/ui.datepicker-pl.js b/ui/i18n/jquery.ui.datepicker-pl.js
similarity index 100%
rename from ui/i18n/ui.datepicker-pl.js
rename to ui/i18n/jquery.ui.datepicker-pl.js
diff --git a/ui/i18n/ui.datepicker-pt-BR.js b/ui/i18n/jquery.ui.datepicker-pt-BR.js
similarity index 100%
rename from ui/i18n/ui.datepicker-pt-BR.js
rename to ui/i18n/jquery.ui.datepicker-pt-BR.js
diff --git a/ui/i18n/ui.datepicker-ro.js b/ui/i18n/jquery.ui.datepicker-ro.js
similarity index 100%
rename from ui/i18n/ui.datepicker-ro.js
rename to ui/i18n/jquery.ui.datepicker-ro.js
diff --git a/ui/i18n/ui.datepicker-ru.js b/ui/i18n/jquery.ui.datepicker-ru.js
similarity index 100%
rename from ui/i18n/ui.datepicker-ru.js
rename to ui/i18n/jquery.ui.datepicker-ru.js
diff --git a/ui/i18n/ui.datepicker-sk.js b/ui/i18n/jquery.ui.datepicker-sk.js
similarity index 100%
rename from ui/i18n/ui.datepicker-sk.js
rename to ui/i18n/jquery.ui.datepicker-sk.js
diff --git a/ui/i18n/ui.datepicker-sl.js b/ui/i18n/jquery.ui.datepicker-sl.js
similarity index 100%
rename from ui/i18n/ui.datepicker-sl.js
rename to ui/i18n/jquery.ui.datepicker-sl.js
diff --git a/ui/i18n/ui.datepicker-sq.js b/ui/i18n/jquery.ui.datepicker-sq.js
similarity index 100%
rename from ui/i18n/ui.datepicker-sq.js
rename to ui/i18n/jquery.ui.datepicker-sq.js
diff --git a/ui/i18n/ui.datepicker-sr-SR.js b/ui/i18n/jquery.ui.datepicker-sr-SR.js
similarity index 100%
rename from ui/i18n/ui.datepicker-sr-SR.js
rename to ui/i18n/jquery.ui.datepicker-sr-SR.js
diff --git a/ui/i18n/ui.datepicker-sr.js b/ui/i18n/jquery.ui.datepicker-sr.js
similarity index 100%
rename from ui/i18n/ui.datepicker-sr.js
rename to ui/i18n/jquery.ui.datepicker-sr.js
diff --git a/ui/i18n/ui.datepicker-sv.js b/ui/i18n/jquery.ui.datepicker-sv.js
similarity index 100%
rename from ui/i18n/ui.datepicker-sv.js
rename to ui/i18n/jquery.ui.datepicker-sv.js
diff --git a/ui/i18n/ui.datepicker-th.js b/ui/i18n/jquery.ui.datepicker-th.js
similarity index 100%
rename from ui/i18n/ui.datepicker-th.js
rename to ui/i18n/jquery.ui.datepicker-th.js
diff --git a/ui/i18n/ui.datepicker-tr.js b/ui/i18n/jquery.ui.datepicker-tr.js
similarity index 100%
rename from ui/i18n/ui.datepicker-tr.js
rename to ui/i18n/jquery.ui.datepicker-tr.js
diff --git a/ui/i18n/ui.datepicker-uk.js b/ui/i18n/jquery.ui.datepicker-uk.js
similarity index 100%
rename from ui/i18n/ui.datepicker-uk.js
rename to ui/i18n/jquery.ui.datepicker-uk.js
diff --git a/ui/i18n/ui.datepicker-vi.js b/ui/i18n/jquery.ui.datepicker-vi.js
similarity index 100%
rename from ui/i18n/ui.datepicker-vi.js
rename to ui/i18n/jquery.ui.datepicker-vi.js
diff --git a/ui/i18n/ui.datepicker-zh-CN.js b/ui/i18n/jquery.ui.datepicker-zh-CN.js
similarity index 100%
rename from ui/i18n/ui.datepicker-zh-CN.js
rename to ui/i18n/jquery.ui.datepicker-zh-CN.js
diff --git a/ui/i18n/ui.datepicker-zh-TW.js b/ui/i18n/jquery.ui.datepicker-zh-TW.js
similarity index 100%
rename from ui/i18n/ui.datepicker-zh-TW.js
rename to ui/i18n/jquery.ui.datepicker-zh-TW.js
diff --git a/ui/effects.blind.js b/ui/jquery.effects.blind.js
similarity index 98%
rename from ui/effects.blind.js
rename to ui/jquery.effects.blind.js
index d8338eae042..ec2ffc4c4b6 100644
--- a/ui/effects.blind.js
+++ b/ui/jquery.effects.blind.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Blind
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.bounce.js b/ui/jquery.effects.bounce.js
similarity index 99%
rename from ui/effects.bounce.js
rename to ui/jquery.effects.bounce.js
index e84ec48c615..617a9d29d9a 100644
--- a/ui/effects.bounce.js
+++ b/ui/jquery.effects.bounce.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Bounce
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.clip.js b/ui/jquery.effects.clip.js
similarity index 98%
rename from ui/effects.clip.js
rename to ui/jquery.effects.clip.js
index d5d2afefbf6..81e456d242d 100644
--- a/ui/effects.clip.js
+++ b/ui/jquery.effects.clip.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Clip
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.core.js b/ui/jquery.effects.core.js
similarity index 100%
rename from ui/effects.core.js
rename to ui/jquery.effects.core.js
diff --git a/ui/effects.drop.js b/ui/jquery.effects.drop.js
similarity index 98%
rename from ui/effects.drop.js
rename to ui/jquery.effects.drop.js
index faf1ee90939..ff46a9d5be0 100644
--- a/ui/effects.drop.js
+++ b/ui/jquery.effects.drop.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Drop
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.explode.js b/ui/jquery.effects.explode.js
similarity index 98%
rename from ui/effects.explode.js
rename to ui/jquery.effects.explode.js
index 2796c3d019c..5a593538842 100644
--- a/ui/effects.explode.js
+++ b/ui/jquery.effects.explode.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Explode
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.fold.js b/ui/jquery.effects.fold.js
similarity index 98%
rename from ui/effects.fold.js
rename to ui/jquery.effects.fold.js
index 0e06186e715..781ac27ee7f 100644
--- a/ui/effects.fold.js
+++ b/ui/jquery.effects.fold.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Fold
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.highlight.js b/ui/jquery.effects.highlight.js
similarity index 97%
rename from ui/effects.highlight.js
rename to ui/jquery.effects.highlight.js
index ebc9582432a..c637f7a26eb 100644
--- a/ui/effects.highlight.js
+++ b/ui/jquery.effects.highlight.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Highlight
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.pulsate.js b/ui/jquery.effects.pulsate.js
similarity index 98%
rename from ui/effects.pulsate.js
rename to ui/jquery.effects.pulsate.js
index 6478b91421d..8ce9e529a65 100644
--- a/ui/effects.pulsate.js
+++ b/ui/jquery.effects.pulsate.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Pulsate
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.scale.js b/ui/jquery.effects.scale.js
similarity index 99%
rename from ui/effects.scale.js
rename to ui/jquery.effects.scale.js
index 3b5a02ca421..1641c9ac0d7 100644
--- a/ui/effects.scale.js
+++ b/ui/jquery.effects.scale.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Scale
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.shake.js b/ui/jquery.effects.shake.js
similarity index 98%
rename from ui/effects.shake.js
rename to ui/jquery.effects.shake.js
index 55460fe6863..8da66f133d5 100644
--- a/ui/effects.shake.js
+++ b/ui/jquery.effects.shake.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Shake
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.slide.js b/ui/jquery.effects.slide.js
similarity index 98%
rename from ui/effects.slide.js
rename to ui/jquery.effects.slide.js
index b1a432e2d39..9c2bc4c78fc 100644
--- a/ui/effects.slide.js
+++ b/ui/jquery.effects.slide.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Slide
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/effects.transfer.js b/ui/jquery.effects.transfer.js
similarity index 97%
rename from ui/effects.transfer.js
rename to ui/jquery.effects.transfer.js
index f616a02ba31..c2a3eed89f2 100644
--- a/ui/effects.transfer.js
+++ b/ui/jquery.effects.transfer.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Effects/Transfer
  *
  * Depends:
- *	effects.core.js
+ *	jquery.effects.core.js
  */
 (function($) {
 
diff --git a/ui/ui.accordion.js b/ui/jquery.ui.accordion.js
similarity index 99%
rename from ui/ui.accordion.js
rename to ui/jquery.ui.accordion.js
index cbad4e91355..31c2badb0d9 100644
--- a/ui/ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Accordion
  *
  * Depends:
- *	ui.core.js
+ *	jquery.ui.core.js
  */
 (function($) {
 
diff --git a/ui/ui.core.js b/ui/jquery.ui.core.js
similarity index 100%
rename from ui/ui.core.js
rename to ui/jquery.ui.core.js
diff --git a/ui/ui.datepicker.js b/ui/jquery.ui.datepicker.js
similarity index 99%
rename from ui/ui.datepicker.js
rename to ui/jquery.ui.datepicker.js
index 57086babc2b..fa2c701a02d 100644
--- a/ui/ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Datepicker
  *
  * Depends:
- *	ui.core.js
+ *	jquery.ui.core.js
  */
 
 (function($) { // hide the namespace
diff --git a/ui/ui.dialog.js b/ui/jquery.ui.dialog.js
similarity index 99%
rename from ui/ui.dialog.js
rename to ui/jquery.ui.dialog.js
index a84947194f7..d03537c314b 100644
--- a/ui/ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -8,10 +8,10 @@
  * http://docs.jquery.com/UI/Dialog
  *
  * Depends:
- *	ui.core.js
- *	ui.draggable.js
- *	ui.position.js
- *	ui.resizable.js
+ *	jquery.ui.core.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
  */
 (function($) {
 
diff --git a/ui/ui.draggable.js b/ui/jquery.ui.draggable.js
similarity index 99%
rename from ui/ui.draggable.js
rename to ui/jquery.ui.draggable.js
index b5e37502be0..aa24b13333f 100644
--- a/ui/ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Draggables
  *
  * Depends:
- *	ui.core.js
+ *	jquery.ui.core.js
  */
 (function($) {
 
diff --git a/ui/ui.droppable.js b/ui/jquery.ui.droppable.js
similarity index 99%
rename from ui/ui.droppable.js
rename to ui/jquery.ui.droppable.js
index 4c359799c79..3d1a7f5ebc6 100644
--- a/ui/ui.droppable.js
+++ b/ui/jquery.ui.droppable.js
@@ -8,8 +8,8 @@
  * http://docs.jquery.com/UI/Droppables
  *
  * Depends:
- *	ui.core.js
- *	ui.draggable.js
+ *	jquery.ui.core.js
+ *	jquery.ui.draggable.js
  */
 (function($) {
 
diff --git a/ui/ui.position.js b/ui/jquery.ui.position.js
similarity index 100%
rename from ui/ui.position.js
rename to ui/jquery.ui.position.js
diff --git a/ui/ui.progressbar.js b/ui/jquery.ui.progressbar.js
similarity index 99%
rename from ui/ui.progressbar.js
rename to ui/jquery.ui.progressbar.js
index 328f8be429c..07921687795 100644
--- a/ui/ui.progressbar.js
+++ b/ui/jquery.ui.progressbar.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Progressbar
  *
  * Depends:
- *   ui.core.js
+ *   jquery.ui.core.js
  */
 (function($) {
 
diff --git a/ui/ui.resizable.js b/ui/jquery.ui.resizable.js
similarity index 99%
rename from ui/ui.resizable.js
rename to ui/jquery.ui.resizable.js
index a6fe65fffa2..0a0c228da82 100644
--- a/ui/ui.resizable.js
+++ b/ui/jquery.ui.resizable.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Resizables
  *
  * Depends:
- *	ui.core.js
+ *	jquery.ui.core.js
  */
 (function($) {
 
diff --git a/ui/ui.selectable.js b/ui/jquery.ui.selectable.js
similarity index 99%
rename from ui/ui.selectable.js
rename to ui/jquery.ui.selectable.js
index 635f1260268..933c6ca96c6 100644
--- a/ui/ui.selectable.js
+++ b/ui/jquery.ui.selectable.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Selectables
  *
  * Depends:
- *	ui.core.js
+ *	jquery.ui.core.js
  */
 (function($) {
 
diff --git a/ui/ui.slider.js b/ui/jquery.ui.slider.js
similarity index 99%
rename from ui/ui.slider.js
rename to ui/jquery.ui.slider.js
index 7c603c624de..f2ea5f67e3c 100644
--- a/ui/ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Slider
  *
  * Depends:
- *	ui.core.js
+ *	jquery.ui.core.js
  */
 
 (function($) {
diff --git a/ui/ui.sortable.js b/ui/jquery.ui.sortable.js
similarity index 99%
rename from ui/ui.sortable.js
rename to ui/jquery.ui.sortable.js
index 0347f86b965..dbfbbb20f9c 100644
--- a/ui/ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Sortables
  *
  * Depends:
- *	ui.core.js
+ *	jquery.ui.core.js
  */
 (function($) {
 
diff --git a/ui/ui.stackfix.js b/ui/jquery.ui.stackfix.js
similarity index 100%
rename from ui/ui.stackfix.js
rename to ui/jquery.ui.stackfix.js
diff --git a/ui/ui.tabs.js b/ui/jquery.ui.tabs.js
similarity index 99%
rename from ui/ui.tabs.js
rename to ui/jquery.ui.tabs.js
index 83025120c85..172177cf2a9 100644
--- a/ui/ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -8,7 +8,7 @@
  * http://docs.jquery.com/UI/Tabs
  *
  * Depends:
- *	ui.core.js
+ *	jquery.ui.core.js
  */
 (function($) {