diff --git a/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj b/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj
index c46c0898f..78a3f13da 100644
--- a/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj
+++ b/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj
@@ -89,35 +89,35 @@
     <Compile Include="Models\Tree.cs" />
     <Compile Include="Models\ViewOrder.cs" />
     <Compile Include="Config.cs" />
-    <Compile Include="OldTest\Demos\1_Query.cs" />
-    <Compile Include="OldTest\Demos\2_Update.cs" />
-    <Compile Include="OldTest\Demos\3_Insert.cs" />
-    <Compile Include="OldTest\Demos\4_Delete.cs" />
-    <Compile Include="OldTest\Demos\5_CodeFirst.cs" />
-    <Compile Include="OldTest\Demos\5_DbFirst.cs" />
-    <Compile Include="OldTest\Demos\6_ComplexModel.cs" />
-    <Compile Include="OldTest\Demos\7_Filter.cs" />
-    <Compile Include="OldTest\Demos\8_JoinSql.cs" />
-    <Compile Include="OldTest\Demos\9_Aop.cs" />
-    <Compile Include="OldTest\Demos\A_MasterSlave.cs" />
-    <Compile Include="OldTest\Demos\B_SharedConnection.cs" />
-    <Compile Include="OldTest\Demos\CS_TeacherStudent.cs" />
-    <Compile Include="OldTest\Demos\C_ExtSqlFun.cs" />
-    <Compile Include="OldTest\Demos\D_QueryableView.cs" />
-    <Compile Include="OldTest\Demos\E_Attribute.cs" />
-    <Compile Include="OldTest\Demos\F_VersionValidation.cs" />
-    <Compile Include="OldTest\Demos\G_Mapper.cs" />
-    <Compile Include="OldTest\Demos\H_ExtEntity.cs" />
-    <Compile Include="OldTest\Demos\H_Queue.cs" />
-    <Compile Include="OldTest\Demos\PerformanceTest.cs" />
-    <Compile Include="OldTest\Demos\Z_DemoBase.cs" />
-    <Compile Include="OldTest\Models\DataTestInfo.cs" />
-    <Compile Include="OldTest\Models\DataTestInfo2.cs" />
-    <Compile Include="OldTest\Models\Enum.cs" />
-    <Compile Include="OldTest\Models\School.cs" />
-    <Compile Include="OldTest\Models\Student.cs" />
-    <Compile Include="OldTest\Models\ViewModelStudent.cs" />
-    <Compile Include="OldTest\Program.cs" />
+    <Compile Include="_OldTest\Demos\1_Query.cs" />
+    <Compile Include="_OldTest\Demos\2_Update.cs" />
+    <Compile Include="_OldTest\Demos\3_Insert.cs" />
+    <Compile Include="_OldTest\Demos\4_Delete.cs" />
+    <Compile Include="_OldTest\Demos\5_CodeFirst.cs" />
+    <Compile Include="_OldTest\Demos\5_DbFirst.cs" />
+    <Compile Include="_OldTest\Demos\6_ComplexModel.cs" />
+    <Compile Include="_OldTest\Demos\7_Filter.cs" />
+    <Compile Include="_OldTest\Demos\8_JoinSql.cs" />
+    <Compile Include="_OldTest\Demos\9_Aop.cs" />
+    <Compile Include="_OldTest\Demos\A_MasterSlave.cs" />
+    <Compile Include="_OldTest\Demos\B_SharedConnection.cs" />
+    <Compile Include="_OldTest\Demos\CS_TeacherStudent.cs" />
+    <Compile Include="_OldTest\Demos\C_ExtSqlFun.cs" />
+    <Compile Include="_OldTest\Demos\D_QueryableView.cs" />
+    <Compile Include="_OldTest\Demos\E_Attribute.cs" />
+    <Compile Include="_OldTest\Demos\F_VersionValidation.cs" />
+    <Compile Include="_OldTest\Demos\G_Mapper.cs" />
+    <Compile Include="_OldTest\Demos\H_ExtEntity.cs" />
+    <Compile Include="_OldTest\Demos\H_Queue.cs" />
+    <Compile Include="_OldTest\Demos\PerformanceTest.cs" />
+    <Compile Include="_OldTest\Demos\Z_DemoBase.cs" />
+    <Compile Include="_OldTest\Models\DataTestInfo.cs" />
+    <Compile Include="_OldTest\Models\DataTestInfo2.cs" />
+    <Compile Include="_OldTest\Models\Enum.cs" />
+    <Compile Include="_OldTest\Models\School.cs" />
+    <Compile Include="_OldTest\Models\Student.cs" />
+    <Compile Include="_OldTest\Models\ViewModelStudent.cs" />
+    <Compile Include="_OldTest\Program.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UnitTest\Main.cs" />
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/1_Query.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/1_Query.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/1_Query.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/1_Query.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/2_Update.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/2_Update.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/2_Update.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/2_Update.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/3_Insert.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/3_Insert.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/3_Insert.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/3_Insert.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/4_Delete.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/4_Delete.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/4_Delete.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/4_Delete.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/5_CodeFirst.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/5_CodeFirst.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/5_CodeFirst.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/5_CodeFirst.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/5_DbFirst.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/5_DbFirst.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/5_DbFirst.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/5_DbFirst.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/6_ComplexModel.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/6_ComplexModel.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/6_ComplexModel.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/6_ComplexModel.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/7_Filter.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/7_Filter.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/7_Filter.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/7_Filter.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/8_JoinSql.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/8_JoinSql.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/8_JoinSql.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/8_JoinSql.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/9_Aop.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/9_Aop.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/9_Aop.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/9_Aop.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/A_MasterSlave.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/A_MasterSlave.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/A_MasterSlave.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/A_MasterSlave.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/B_SharedConnection.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/B_SharedConnection.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/B_SharedConnection.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/B_SharedConnection.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/CS_TeacherStudent.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/CS_TeacherStudent.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/CS_TeacherStudent.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/CS_TeacherStudent.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/C_ExtSqlFun.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/C_ExtSqlFun.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/C_ExtSqlFun.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/C_ExtSqlFun.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/D_QueryableView.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/D_QueryableView.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/D_QueryableView.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/D_QueryableView.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/E_Attribute.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/E_Attribute.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/E_Attribute.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/E_Attribute.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/F_VersionValidation.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/F_VersionValidation.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/F_VersionValidation.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/F_VersionValidation.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/G_Mapper.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/G_Mapper.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/G_Mapper.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/G_Mapper.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/H_ExtEntity.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/H_ExtEntity.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/H_ExtEntity.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/H_ExtEntity.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/H_Queue.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/H_Queue.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/H_Queue.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/H_Queue.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/PerformanceTest.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/PerformanceTest.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/PerformanceTest.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/PerformanceTest.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Demos/Z_DemoBase.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Demos/Z_DemoBase.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Demos/Z_DemoBase.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Demos/Z_DemoBase.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Models/DataTestInfo.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Models/DataTestInfo.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Models/DataTestInfo.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Models/DataTestInfo.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Models/DataTestInfo2.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Models/DataTestInfo2.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Models/DataTestInfo2.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Models/DataTestInfo2.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Models/Enum.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Models/Enum.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Models/Enum.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Models/Enum.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Models/School.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Models/School.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Models/School.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Models/School.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Models/Student.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Models/Student.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Models/Student.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Models/Student.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Models/ViewModelStudent.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Models/ViewModelStudent.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Models/ViewModelStudent.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Models/ViewModelStudent.cs
diff --git a/Src/Asp.Net/PgSqlTest/OldTest/Program.cs b/Src/Asp.Net/PgSqlTest/_OldTest/Program.cs
similarity index 100%
rename from Src/Asp.Net/PgSqlTest/OldTest/Program.cs
rename to Src/Asp.Net/PgSqlTest/_OldTest/Program.cs