66 files changed, 29 insertions, 274 deletions
diff --git a/demos/sqlmap-docs/protected/application.xml b/demos/sqlmap-docs/protected/application.xml
deleted file mode 100644
index f2fb1eed..00000000
--- a/demos/sqlmap-docs/protected/application.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<application id="QuickStart" Mode="Debug">
-  <paths>
-	<alias id="QSThemes" path="../../quickstart/themes/" />
-	<alias id="Quickstart" path="../../quickstart/protected/" />
-  </paths>
-  <modules>
-	<module id="quickstart_search" 
-    	class="Quickstart.index.ZendSearch"
-    	IndexDataDirectory="Application.index.sqlmap" />
-  </modules>
-  <paths>
-    <using namespace="Application.controls.*" />
-  </paths>
-  <services>
-	<modules>
-	    <module id="theme"
-                class="System.Web.UI.TThemeManager"
-                BasePath="QSThemes"
-                BaseUrl="../quickstart/themes" />
-	</modules>
-    <service id="page" class="TPageService" DefaultPage="GettingStarted.Introduction" />
-  </services>
-</application>
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/index.php b/demos/sqlmap-sample/index.php
deleted file mode 100644
index 43c0b436..00000000
--- a/demos/sqlmap-sample/index.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$basePath=dirname(__FILE__);
-$frameworkPath=$basePath.'/../../framework/prado.php';
-$assetsPath=$basePath.'/assets';
-$runtimePath=$basePath.'/protected/runtime';
-
-if(!is_writable($assetsPath))
-	die("Please make sure that the directory $assetsPath is writable by Web server process.");
-if(!is_writable($runtimePath))
-	die("Please make sure that the directory $runtimePath is writable by Web server process.");
-
-require_once($frameworkPath);
-
-$application=new TApplication;
-$application->run();
-
-?>
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/protected/person-db/person.xml b/demos/sqlmap-sample/protected/person-db/person.xml
deleted file mode 100644
index 4ffe44d9..00000000
--- a/demos/sqlmap-sample/protected/person-db/person.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<sqlMap>
-
-	<select id="SelectAll" resultClass="Person">
-		SELECT
-			per_id as ID,
-			per_first_name as FirstName,
-			per_last_name as LastName,
-			per_birth_date as BirthDate,
-			per_weight_kg as WeightInKilograms,
-			per_height_m as HeightInMeters
-		FROM 
-			person
-	</select>
-
-</sqlMap>
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/protected/person-db/personHelper.xml b/demos/sqlmap-sample/protected/person-db/personHelper.xml
deleted file mode 100644
index ea2d4302..00000000
--- a/demos/sqlmap-sample/protected/person-db/personHelper.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?> 
-
-<sqlMap Name="PersonHelper">
-
-  <select id="Select" parameterClass="int" resultClass="Person">
-   select
-    PER_ID as ID,
-    PER_FIRST_NAME as FirstName,
-    PER_LAST_NAME as LastName,
-    PER_BIRTH_DATE as BirthDate,
-    PER_WEIGHT_KG as WeightInKilograms,
-    PER_HEIGHT_M as HeightInMeters
-    from PERSON
-	WHERE
-      PER_ID = #value#
-  </select>
-
-  <insert id="Insert" parameterClass="Person">
-   insert into PERSON 
-    (PER_ID, PER_FIRST_NAME, PER_LAST_NAME,
-    PER_BIRTH_DATE, PER_WEIGHT_KG, PER_HEIGHT_M)
-   values 
-    (#ID#, #FirstName#, #LastName#, 
-    #BirthDate#, #WeightInKilograms#, #HeightInMeters#)
-  </insert>
-
-  <update id="Update" parameterClass="Person">
-   update PERSON set
-    PER_FIRST_NAME = #FirstName#,
-    PER_LAST_NAME = #LastName#, 
-    PER_BIRTH_DATE = #BirthDate#,
-    PER_WEIGHT_KG = #WeightInKilograms#,
-    PER_HEIGHT_M = #HeightInMeters#
-   where PER_ID = #ID#
-  </update>
-
-  <delete id="Delete" parameterClass="int">
-   delete from PERSON
-   where PER_ID = #value#
-  </delete>
-
-</sqlMap>
diff --git a/demos/sqlmap-sample/protected/person-db/test.db b/demos/sqlmap-sample/protected/person-db/test.db
deleted file mode 100644
index a40c91fe..00000000
--- a/demos/sqlmap-sample/protected/person-db/test.db
+++ /dev/null
diff --git a/demos/sqlmap-sample/protected/person-sqlmap.xml b/demos/sqlmap-sample/protected/person-sqlmap.xml
deleted file mode 100644
index 8d5319e8..00000000
--- a/demos/sqlmap-sample/protected/person-sqlmap.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMapConfig>
-
-	<provider class="TAdodbProvider">
-		<datasource driver="sqlite" host="protected/person-db/test.db" />
-	</provider>
-
-	<sqlMaps>
-		<sqlMap resource="person-db/person.xml"/>
-		<sqlMap resource="person-db/personHelper.xml"/>
-	</sqlMaps>
-
-</sqlMapConfig>
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/protected/petshop-db/petshop.db b/demos/sqlmap-sample/protected/petshop-db/petshop.db
deleted file mode 100644
index 9a4404df..00000000
--- a/demos/sqlmap-sample/protected/petshop-db/petshop.db
+++ /dev/null
diff --git a/demos/sqlmap-sample/protected/petshop-db/products.xml b/demos/sqlmap-sample/protected/petshop-db/products.xml
deleted file mode 100644
index 3c2899a7..00000000
--- a/demos/sqlmap-sample/protected/petshop-db/products.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<sqlmap>
-
-	<cacheModel id="product-cache" implementation="basic">
-		<!-- cache data for 60 seconds -->
-		<property name="expiry" value="60" /> 
-	</cacheModel>
-
-	<select id="SelectAllProducts" cacheModel="product-cache" >
-		SELECT * 
-		FROM 
-			product
-	</select>
-
-</sqlmap>
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/protected/petshop-sqlmap.xml b/demos/sqlmap-sample/protected/petshop-sqlmap.xml
deleted file mode 100644
index f77fe2b7..00000000
--- a/demos/sqlmap-sample/protected/petshop-sqlmap.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMapConfig>
-
-	<provider class="TAdodbProvider">
-		<datasource driver="sqlite" host="protected/petshop-db/petshop.db" />
-	</provider>
-
-	<sqlMaps>
-		<sqlMap resource="petshop-db/products.xml"/>
-	</sqlMaps>
-
-</sqlMapConfig>
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/tests/PersonTest.php b/demos/sqlmap-sample/tests/PersonTest.php
deleted file mode 100644
index c40bffa0..00000000
--- a/demos/sqlmap-sample/tests/PersonTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-class PersonTest extends UnitTestCase
-{
-	function testPersonList()
-	{
-		//try it
-		$people = TMapper::instance()->queryForList("SelectAll");
-
-		//test it
-		$this->assertNotNull($people, "Person list is not returned");
-		$this->assertTrue(count($people) > 0, "Person list is empty");
-		$person = $people[0];
-		$this->assertNotNull($person, "Person not returned");
-	}
-
-	function testPersonUpdate()
-	{
-		$expect = "wei";
-		$edited = "Nah";
-		
-		//get it;
-		$person = TMapper::instance()->queryForObject("Select", 1);
-
-		//test it
-		$this->assertNotNull($person);
-		$this->assertEqual($expect, $person->FirstName);
-
-		//change it
-		$person->FirstName = $edited;
-		TMapper::instance()->update("Update", $person);
-
-		//get it again
-		$person = TMapper::instance()->queryForObject("Select", 1);
-
-		//test it
-		$this->assertEqual($edited, $person->FirstName);
-
-		//change it back
-		$person->FirstName = $expect;
-		TMapper::instance()->update("Update", $person);
-	}
-
-	function testPersonDelete()
-	{
-		//insert it
-		$person = new Person;
-		$person->ID = -1;
-		TMapper::instance()->insert("Insert", $person);
-
-		//delte it
-		$count = TMapper::instance()->delete("Delete", -1);
-		$this->assertEqual(1, $count);
-	}
-}
-
-?>
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/tests/readme.txt b/demos/sqlmap-sample/tests/readme.txt
deleted file mode 100644
index c0d0afdb..00000000
--- a/demos/sqlmap-sample/tests/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-The ''Data'' directory and ''Data/test.db'' must be writable by PHP for SQLite database to work.
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/tests/run_tests.php b/demos/sqlmap-sample/tests/run_tests.php
deleted file mode 100644
index 843d0a79..00000000
--- a/demos/sqlmap-sample/tests/run_tests.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-//define simple test location
-define('SIMPLE_TEST', realpath('../../../tests/UnitTests/simpletest'));
-
-//define prado framework location
-define('PRADO', realpath('../../../framework'));
-
-//define directory that contains business objects
-define('MY_MODELS', realpath('../protected/business-objects'));
-
-require_once(SIMPLE_TEST.'/unit_tester.php');
-require_once(SIMPLE_TEST.'/reporter.php');
-require_once(PRADO.'/prado.php');
-require_once(MY_MODELS.'/Person.php');
-
-//supress strict warnings 
-error_reporting(E_ALL);
-
-//import Data mapper
-Prado::using('System.DataAccess.SQLMap.TMapper');
-
-//Add tests
-$test = new GroupTest('SQLMap Tutorial tests');
-$test->addTestFile('PersonTest.php');
-if(SimpleReporter::inCli())
-	$reporter = new TextReporter();
-else
-	$reporter = new HtmlReporter();
-$test->run($reporter);
-
-
-?>
-\ No newline at end of file
diff --git a/demos/sqlmap-sample/tests/sqlmap.xml b/demos/sqlmap-sample/tests/sqlmap.xml
deleted file mode 100644
index 3968fab4..00000000
--- a/demos/sqlmap-sample/tests/sqlmap.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMapConfig>
-
-	<provider class="TAdodbProvider">
-		<datasource driver="sqlite" host="../protected/person-db/test.db" />
-	</provider>
-
-	<sqlMaps>
-		<sqlMap resource="../protected/person-db/person.xml"/>
-		<sqlMap resource="../protected/person-db/personHelper.xml"/>
-	</sqlMaps>
-
-</sqlMapConfig>
-\ No newline at end of file
diff --git a/demos/sqlmap-docs/index.php b/demos/sqlmap/index.php
index afada2c1..afada2c1 100644
--- a/demos/sqlmap-docs/index.php
+++ b/demos/sqlmap/index.php
diff --git a/demos/sqlmap-docs/protected/.htaccess b/demos/sqlmap/protected/.htaccess
index 3418e55a..3418e55a 100644
--- a/demos/sqlmap-docs/protected/.htaccess
+++ b/demos/sqlmap/protected/.htaccess
diff --git a/demos/sqlmap-sample/protected/application.xml b/demos/sqlmap/protected/application.xml
index 7cfb440f..7cfb440f 100644
--- a/demos/sqlmap-sample/protected/application.xml
+++ b/demos/sqlmap/protected/application.xml
diff --git a/demos/sqlmap-sample/protected/business-objects/Person.php b/demos/sqlmap/protected/business-objects/Person.php
index ad9da4b3..ad9da4b3 100644
--- a/demos/sqlmap-sample/protected/business-objects/Person.php
+++ b/demos/sqlmap/protected/business-objects/Person.php
diff --git a/demos/sqlmap-docs/protected/controls/Layout.php b/demos/sqlmap/protected/controls/Layout.php
index e612d52d..e612d52d 100644
--- a/demos/sqlmap-docs/protected/controls/Layout.php
+++ b/demos/sqlmap/protected/controls/Layout.php
diff --git a/demos/sqlmap-docs/protected/controls/Layout.tpl b/demos/sqlmap/protected/controls/Layout.tpl
index c62cc046..c62cc046 100644
--- a/demos/sqlmap-docs/protected/controls/Layout.tpl
+++ b/demos/sqlmap/protected/controls/Layout.tpl
diff --git a/demos/sqlmap-docs/protected/controls/TopicList.php b/demos/sqlmap/protected/controls/TopicList.php
index ce827cc0..ce827cc0 100644
--- a/demos/sqlmap-docs/protected/controls/TopicList.php
+++ b/demos/sqlmap/protected/controls/TopicList.php
diff --git a/demos/sqlmap-docs/protected/controls/TopicList.tpl b/demos/sqlmap/protected/controls/TopicList.tpl
index 6c7a3e9e..6c7a3e9e 100644
--- a/demos/sqlmap-docs/protected/controls/TopicList.tpl
+++ b/demos/sqlmap/protected/controls/TopicList.tpl
diff --git a/demos/sqlmap-docs/protected/pages/Home.page b/demos/sqlmap/protected/pages/Home.page
index ff226d4e..ff226d4e 100644
--- a/demos/sqlmap-docs/protected/pages/Home.page
+++ b/demos/sqlmap/protected/pages/Home.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/BigPicture.page b/demos/sqlmap/protected/pages/Manual/BigPicture.page
index 7857d6ec..7857d6ec 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/BigPicture.page
+++ b/demos/sqlmap/protected/pages/Manual/BigPicture.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/BuildingTSqlMapper.page b/demos/sqlmap/protected/pages/Manual/BuildingTSqlMapper.page
index 87165da2..87165da2 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/BuildingTSqlMapper.page
+++ b/demos/sqlmap/protected/pages/Manual/BuildingTSqlMapper.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/CacheModels.page b/demos/sqlmap/protected/pages/Manual/CacheModels.page
index 94f20f3d..94f20f3d 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/CacheModels.page
+++ b/demos/sqlmap/protected/pages/Manual/CacheModels.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/CodingExamples.page b/demos/sqlmap/protected/pages/Manual/CodingExamples.page
index bbd1488e..bbd1488e 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/CodingExamples.page
+++ b/demos/sqlmap/protected/pages/Manual/CodingExamples.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/ComplexProperties.page b/demos/sqlmap/protected/pages/Manual/ComplexProperties.page
index f62795f8..f62795f8 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/ComplexProperties.page
+++ b/demos/sqlmap/protected/pages/Manual/ComplexProperties.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/CompositeKeys.page b/demos/sqlmap/protected/pages/Manual/CompositeKeys.page
index 6e33c6cd..6e33c6cd 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/CompositeKeys.page
+++ b/demos/sqlmap/protected/pages/Manual/CompositeKeys.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/ConfigurationElements.page b/demos/sqlmap/protected/pages/Manual/ConfigurationElements.page
index 589a6dde..589a6dde 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/ConfigurationElements.page
+++ b/demos/sqlmap/protected/pages/Manual/ConfigurationElements.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/Configuring.page b/demos/sqlmap/protected/pages/Manual/Configuring.page
index 75dade31..75dade31 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/Configuring.page
+++ b/demos/sqlmap/protected/pages/Manual/Configuring.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/CustomTypeHandlers.page b/demos/sqlmap/protected/pages/Manual/CustomTypeHandlers.page
index c66820cf..c66820cf 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/CustomTypeHandlers.page
+++ b/demos/sqlmap/protected/pages/Manual/CustomTypeHandlers.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/DataMapperAPI.page b/demos/sqlmap/protected/pages/Manual/DataMapperAPI.page
index 8f0b66a4..8f0b66a4 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/DataMapperAPI.page
+++ b/demos/sqlmap/protected/pages/Manual/DataMapperAPI.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/DynamicSQL.page b/demos/sqlmap/protected/pages/Manual/DynamicSQL.page
index 2ed8c6ec..2ed8c6ec 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/DynamicSQL.page
+++ b/demos/sqlmap/protected/pages/Manual/DynamicSQL.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/ImplicitResultMaps.page b/demos/sqlmap/protected/pages/Manual/ImplicitResultMaps.page
index 07dc61e0..07dc61e0 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/ImplicitResultMaps.page
+++ b/demos/sqlmap/protected/pages/Manual/ImplicitResultMaps.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/InheritanceMapping.page b/demos/sqlmap/protected/pages/Manual/InheritanceMapping.page
index 0458a291..0458a291 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/InheritanceMapping.page
+++ b/demos/sqlmap/protected/pages/Manual/InheritanceMapping.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/InlineParameterMaps.page b/demos/sqlmap/protected/pages/Manual/InlineParameterMaps.page
index 3bfa4ceb..3bfa4ceb 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/InlineParameterMaps.page
+++ b/demos/sqlmap/protected/pages/Manual/InlineParameterMaps.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/Installing.page b/demos/sqlmap/protected/pages/Manual/Installing.page
index bb083996..bb083996 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/Installing.page
+++ b/demos/sqlmap/protected/pages/Manual/Installing.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/MappedStatements.page b/demos/sqlmap/protected/pages/Manual/MappedStatements.page
index c4dfa3d9..c4dfa3d9 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/MappedStatements.page
+++ b/demos/sqlmap/protected/pages/Manual/MappedStatements.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/Overview.page b/demos/sqlmap/protected/pages/Manual/Overview.page
index 694daf68..694daf68 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/Overview.page
+++ b/demos/sqlmap/protected/pages/Manual/Overview.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/ParameterMap.page b/demos/sqlmap/protected/pages/Manual/ParameterMap.page
index de574139..de574139 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/ParameterMap.page
+++ b/demos/sqlmap/protected/pages/Manual/ParameterMap.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/ResultMapAttributes.page b/demos/sqlmap/protected/pages/Manual/ResultMapAttributes.page
index dd754197..dd754197 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/ResultMapAttributes.page
+++ b/demos/sqlmap/protected/pages/Manual/ResultMapAttributes.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/ResultMaps.page b/demos/sqlmap/protected/pages/Manual/ResultMaps.page
index 97165ffb..97165ffb 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/ResultMaps.page
+++ b/demos/sqlmap/protected/pages/Manual/ResultMaps.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/StatementElementAttributes.page b/demos/sqlmap/protected/pages/Manual/StatementElementAttributes.page
index e5cef09d..e5cef09d 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/StatementElementAttributes.page
+++ b/demos/sqlmap/protected/pages/Manual/StatementElementAttributes.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/TheSQL.page b/demos/sqlmap/protected/pages/Manual/TheSQL.page
index 0817ec26..0817ec26 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/TheSQL.page
+++ b/demos/sqlmap/protected/pages/Manual/TheSQL.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/WorkingWithDataMaps.page b/demos/sqlmap/protected/pages/Manual/WorkingWithDataMaps.page
index 321b2993..321b2993 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/WorkingWithDataMaps.page
+++ b/demos/sqlmap/protected/pages/Manual/WorkingWithDataMaps.page
diff --git a/demos/sqlmap-docs/protected/pages/Manual/diagram.png b/demos/sqlmap/protected/pages/Manual/diagram.png
index 0a0ca73d..0a0ca73d 100644
--- a/demos/sqlmap-docs/protected/pages/Manual/diagram.png
+++ b/demos/sqlmap/protected/pages/Manual/diagram.png
diff --git a/demos/sqlmap-sample/protected/pages/Home.page b/demos/sqlmap/protected/pages/Sample/Home.page
index 6d059c7e..6d059c7e 100644
--- a/demos/sqlmap-sample/protected/pages/Home.page
+++ b/demos/sqlmap/protected/pages/Sample/Home.page
diff --git a/demos/sqlmap-sample/protected/pages/ProductList.page b/demos/sqlmap/protected/pages/Sample/ProductList.page
index 904d411d..904d411d 100644
--- a/demos/sqlmap-sample/protected/pages/ProductList.page
+++ b/demos/sqlmap/protected/pages/Sample/ProductList.page
diff --git a/demos/sqlmap-sample/protected/pages/ProductList.php b/demos/sqlmap/protected/pages/Sample/ProductList.php
index a35c40ea..a35c40ea 100644
--- a/demos/sqlmap-sample/protected/pages/ProductList.php
+++ b/demos/sqlmap/protected/pages/Sample/ProductList.php
diff --git a/demos/sqlmap-sample/protected/pages/crud1.page b/demos/sqlmap/protected/pages/Sample/crud1.page
index ce467ffa..ce467ffa 100644
--- a/demos/sqlmap-sample/protected/pages/crud1.page
+++ b/demos/sqlmap/protected/pages/Sample/crud1.page
diff --git a/demos/sqlmap-sample/protected/pages/crud1.php b/demos/sqlmap/protected/pages/Sample/crud1.php
index 40733dc9..40733dc9 100644
--- a/demos/sqlmap-sample/protected/pages/crud1.php
+++ b/demos/sqlmap/protected/pages/Sample/crud1.php
diff --git a/demos/sqlmap-sample/protected/pages/crud2.page b/demos/sqlmap/protected/pages/Sample/crud2.page
index 4d34e873..4d34e873 100644
--- a/demos/sqlmap-sample/protected/pages/crud2.page
+++ b/demos/sqlmap/protected/pages/Sample/crud2.page
diff --git a/demos/sqlmap-sample/protected/pages/crud2.php b/demos/sqlmap/protected/pages/Sample/crud2.php
index 46fe3893..46fe3893 100644
--- a/demos/sqlmap-sample/protected/pages/crud2.php
+++ b/demos/sqlmap/protected/pages/Sample/crud2.php
diff --git a/demos/sqlmap-docs/protected/pages/Tutorial/TestAgain.page b/demos/sqlmap/protected/pages/Tutorial/TestAgain.page
index 4adac73b..4adac73b 100644
--- a/demos/sqlmap-docs/protected/pages/Tutorial/TestAgain.page
+++ b/demos/sqlmap/protected/pages/Tutorial/TestAgain.page
diff --git a/demos/sqlmap-docs/protected/pages/Tutorial/TestFirst.page b/demos/sqlmap/protected/pages/Tutorial/TestFirst.page
index 80a155cb..80a155cb 100644
--- a/demos/sqlmap-docs/protected/pages/Tutorial/TestFirst.page
+++ b/demos/sqlmap/protected/pages/Tutorial/TestFirst.page
diff --git a/demos/sqlmap-docs/protected/pages/Tutorial/TestSecond.page b/demos/sqlmap/protected/pages/Tutorial/TestSecond.page
index 706b5220..706b5220 100644
--- a/demos/sqlmap-docs/protected/pages/Tutorial/TestSecond.page
+++ b/demos/sqlmap/protected/pages/Tutorial/TestSecond.page
diff --git a/demos/sqlmap-docs/protected/pages/Tutorial/example1.png b/demos/sqlmap/protected/pages/Tutorial/example1.png
index b5241de6..b5241de6 100644
--- a/demos/sqlmap-docs/protected/pages/Tutorial/example1.png
+++ b/demos/sqlmap/protected/pages/Tutorial/example1.png
diff --git a/demos/sqlmap-docs/protected/pages/Tutorial/grid1.png b/demos/sqlmap/protected/pages/Tutorial/grid1.png
index 845b9581..845b9581 100644
--- a/demos/sqlmap-docs/protected/pages/Tutorial/grid1.png
+++ b/demos/sqlmap/protected/pages/Tutorial/grid1.png
diff --git a/demos/sqlmap-docs/protected/pages/Tutorial/grid2.png b/demos/sqlmap/protected/pages/Tutorial/grid2.png
index dcafc33d..dcafc33d 100644
--- a/demos/sqlmap-docs/protected/pages/Tutorial/grid2.png
+++ b/demos/sqlmap/protected/pages/Tutorial/grid2.png
diff --git a/demos/sqlmap-docs/protected/pages/config.xml b/demos/sqlmap/protected/pages/config.xml
index e0850c2c..e0850c2c 100644
--- a/demos/sqlmap-docs/protected/pages/config.xml
+++ b/demos/sqlmap/protected/pages/config.xml
diff --git a/demos/time-tracker/protected/controls/TopicList.tpl b/demos/time-tracker/protected/controls/TopicList.tpl
deleted file mode 100644
index bc9fff26..00000000
--- a/demos/time-tracker/protected/controls/TopicList.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="toc">
-
-<div class="topic">
-<ul>
-	<li><a href="?page=preface">Preface</a></li>
-</ul>
-<div>Prado Time Tracker Implementation Guide</div>
-<ul>
-	<li><a href="?page=Introduction">Introduction</a></li>
-	<li><a href="?page=GettingStarted">Installation</a></li>
-	<li><a href="?page=WritingUnitTest">Writing a Unit Test</a></li>
-	<li><a href="?page=WritingFunctionalTest">Writing a Functional Web Test</a></li>
-</ul>
-
-<div>Testing Business Code</div>
-<ul>
-	<li><a href="?page=CreateBusinessCode">Create Business Code</a></li>
-	<li><a href="?page=UsingSQLMap">Using SQLMap Data Mapper</a></li>
-	<li><a href="?page=UserClassAndExceptions">User Class and Exceptions</a></li>
-	<li><a href="?page=MoreTests">More Tests</a></li>
-</ul>
-
-</div>
-
-
-
-</div>
-\ No newline at end of file
diff --git a/demos/time-tracker/protected/controls/Layout.php b/demos/time-tracker/protected/pages/Docs/Layout.php
index e612d52d..e612d52d 100644
--- a/demos/time-tracker/protected/controls/Layout.php
+++ b/demos/time-tracker/protected/pages/Docs/Layout.php
diff --git a/demos/time-tracker/protected/controls/Layout.tpl b/demos/time-tracker/protected/pages/Docs/Layout.tpl
index 95c88fd8..291c2482 100644
--- a/demos/time-tracker/protected/controls/Layout.tpl
+++ b/demos/time-tracker/protected/pages/Docs/Layout.tpl
@@ -23,7 +23,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
 <td valign="top" width="1">
-<com:Application.controls.TopicList ID="TopicPanel" />
+<com:Application.pages.Docs.TopicList ID="TopicPanel" />
 </td>
 <td valign="top">
 <div id="content">
diff --git a/demos/time-tracker/protected/controls/TopicList.php b/demos/time-tracker/protected/pages/Docs/TopicList.php
index ce827cc0..ce827cc0 100644
--- a/demos/time-tracker/protected/controls/TopicList.php
+++ b/demos/time-tracker/protected/pages/Docs/TopicList.php
diff --git a/demos/time-tracker/protected/pages/Docs/TopicList.tpl b/demos/time-tracker/protected/pages/Docs/TopicList.tpl
new file mode 100644
index 00000000..5fa2adb5
--- /dev/null
+++ b/demos/time-tracker/protected/pages/Docs/TopicList.tpl
@@ -0,0 +1,27 @@
+<div id="toc">
+
+<div class="topic">
+<ul>
+	<li><a href="?page=Docs.preface">Preface</a></li>
+</ul>
+<div>Prado Time Tracker Implementation Guide</div>
+<ul>
+	<li><a href="?page=Docs.Introduction">Introduction</a></li>
+	<li><a href="?page=Docs.GettingStarted">Installation</a></li>
+	<li><a href="?page=Docs.WritingUnitTest">Writing a Unit Test</a></li>
+	<li><a href="?page=Docs.WritingFunctionalTest">Writing a Functional Web Test</a></li>
+</ul>
+
+<div>Testing Business Code</div>
+<ul>
+	<li><a href="?page=Docs.CreateBusinessCode">Create Business Code</a></li>
+	<li><a href="?page=Docs.UsingSQLMap">Using SQLMap Data Mapper</a></li>
+	<li><a href="?page=Docs.UserClassAndExceptions">User Class and Exceptions</a></li>
+	<li><a href="?page=Docs.MoreTests">More Tests</a></li>
+</ul>
+
+</div>
+
+
+
+</div>
+\ No newline at end of file
diff --git a/demos/time-tracker/protected/pages/Docs/config.xml b/demos/time-tracker/protected/pages/Docs/config.xml
index e0850c2c..da4d3bfc 100644
--- a/demos/time-tracker/protected/pages/Docs/config.xml
+++ b/demos/time-tracker/protected/pages/Docs/config.xml
@@ -4,5 +4,5 @@
   <paths>
     <alias id="Pages" path="." />
   </paths>
-  <pages MasterClass="Application.controls.Layout" Theme="PradoSoft" />
+  <pages MasterClass="Application.pages.Docs.Layout" />
 </configuration>
 \ No newline at end of file