diff --git a/module/admin/test/lib/modemanagement.ui.class.php b/module/admin/test/lib/ui/modemanagement.ui.class.php
similarity index 93%
rename from module/admin/test/lib/modemanagement.ui.class.php
rename to module/admin/test/lib/ui/modemanagement.ui.class.php
index e99b184a83..562cfb6a66 100644
--- a/module/admin/test/lib/modemanagement.ui.class.php
+++ b/module/admin/test/lib/ui/modemanagement.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class modeManagementTester extends tester
 {
     /**
diff --git a/module/admin/test/ui/modemanagement.php b/module/admin/test/ui/modemanagement.php
index 2307c5b471..ba43319742 100755
--- a/module/admin/test/ui/modemanagement.php
+++ b/module/admin/test/ui/modemanagement.php
@@ -12,7 +12,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/modemanagement.ui.class.php';
+include '../lib/ui/modemanagement.ui.class.php';
 
 $program = zenData('project');
 $program->id->range('1-3');
diff --git a/module/branch/test/lib/batcheditbranch.ui.class.php b/module/branch/test/lib/ui/batcheditbranch.ui.class.php
similarity index 97%
rename from module/branch/test/lib/batcheditbranch.ui.class.php
rename to module/branch/test/lib/ui/batcheditbranch.ui.class.php
index 14424520d0..fd1e58e857 100644
--- a/module/branch/test/lib/batcheditbranch.ui.class.php
+++ b/module/branch/test/lib/ui/batcheditbranch.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchEditBranchTester extends tester
 {
     /**
diff --git a/module/branch/test/lib/createbranch.ui.class.php b/module/branch/test/lib/ui/createbranch.ui.class.php
similarity index 97%
rename from module/branch/test/lib/createbranch.ui.class.php
rename to module/branch/test/lib/ui/createbranch.ui.class.php
index 401ce47f9c..68da80da82 100755
--- a/module/branch/test/lib/createbranch.ui.class.php
+++ b/module/branch/test/lib/ui/createbranch.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createBranchTester extends tester
 {
     /**
diff --git a/module/branch/test/lib/editbranch.ui.class.php b/module/branch/test/lib/ui/editbranch.ui.class.php
similarity index 97%
rename from module/branch/test/lib/editbranch.ui.class.php
rename to module/branch/test/lib/ui/editbranch.ui.class.php
index f2bc16a8a0..7b87776ec5 100644
--- a/module/branch/test/lib/editbranch.ui.class.php
+++ b/module/branch/test/lib/ui/editbranch.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editBranchTester extends tester
 {
     /**
diff --git a/module/branch/test/lib/manage.ui.class.php b/module/branch/test/lib/ui/manage.ui.class.php
similarity index 97%
rename from module/branch/test/lib/manage.ui.class.php
rename to module/branch/test/lib/ui/manage.ui.class.php
index 0a123d1cff..c0a89a2531 100644
--- a/module/branch/test/lib/manage.ui.class.php
+++ b/module/branch/test/lib/ui/manage.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class manageTester extends tester
 {
     /**
diff --git a/module/branch/test/ui/batcheditbranch.php b/module/branch/test/ui/batcheditbranch.php
index 05ca36a1fc..2abd0de431 100755
--- a/module/branch/test/ui/batcheditbranch.php
+++ b/module/branch/test/ui/batcheditbranch.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/batcheditbranch.ui.class.php';
+include '../lib/ui/batcheditbranch.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('11');
diff --git a/module/branch/test/ui/changestatus.php b/module/branch/test/ui/changestatus.php
index a13d61f682..191254ee1e 100755
--- a/module/branch/test/ui/changestatus.php
+++ b/module/branch/test/ui/changestatus.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/manage.ui.class.php';
+include '../lib/ui/manage.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('11');
diff --git a/module/branch/test/ui/createbranch.php b/module/branch/test/ui/createbranch.php
index 0cd71970de..31fda5217b 100755
--- a/module/branch/test/ui/createbranch.php
+++ b/module/branch/test/ui/createbranch.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/createbranch.ui.class.php';
+include '../lib/ui/createbranch.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('11');
diff --git a/module/branch/test/ui/editbranch.php b/module/branch/test/ui/editbranch.php
index f5b642ff74..39b91f24d4 100755
--- a/module/branch/test/ui/editbranch.php
+++ b/module/branch/test/ui/editbranch.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/editbranch.ui.class.php';
+include '../lib/ui/editbranch.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('11');
diff --git a/module/branch/test/ui/switchtab.php b/module/branch/test/ui/switchtab.php
index 1c58bcf2ca..16d2cbafc3 100755
--- a/module/branch/test/ui/switchtab.php
+++ b/module/branch/test/ui/switchtab.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/manage.ui.class.php';
+include '../lib/ui/manage.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('11');
diff --git a/module/bug/test/lib/confirmbug.ui.class.php b/module/bug/test/lib/ui/confirmbug.ui.class.php
similarity index 99%
rename from module/bug/test/lib/confirmbug.ui.class.php
rename to module/bug/test/lib/ui/confirmbug.ui.class.php
index c01720f5eb..43146ac339 100755
--- a/module/bug/test/lib/confirmbug.ui.class.php
+++ b/module/bug/test/lib/ui/confirmbug.ui.class.php
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class confirmBugTester extends tester
 {
     /**
@@ -116,7 +116,7 @@ class confirmBugTester extends tester
     public function bugAssert(string $bugTitle = '', object $list = null)
     {
         if(empty($bugTitle) || !is_object($list)) return $this->failed('获取bug标题失败');
-        
+
         $backtrace = debug_backtrace();
         if(!$backtrace[1]['function']) return $this->failed("代码有误");
         switch($backtrace[1]['function']){
@@ -185,4 +185,4 @@ class confirmBugTester extends tester
         if($this->response('method') == 'report') return $this->success('bug表单验证成功');
         return $this->failed('bug表单验证失败');
     }
-}
\ No newline at end of file
+}
diff --git a/module/bug/test/lib/createbug.ui.class.php b/module/bug/test/lib/ui/createbug.ui.class.php
similarity index 91%
rename from module/bug/test/lib/createbug.ui.class.php
rename to module/bug/test/lib/ui/createbug.ui.class.php
index c5f358b2f9..61573b5242 100755
--- a/module/bug/test/lib/createbug.ui.class.php
+++ b/module/bug/test/lib/ui/createbug.ui.class.php
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createBugTester extends tester
 {
     public function createDefaultBug($project = array(), $bug = array())
@@ -46,14 +46,14 @@ class createBugTester extends tester
         {
             for($i = 0; $i < count($bugs); $i++)
             {
-                if(isset($bugs[$i]['title']))    $form->dom->{"title[" . ($i + 1) . "]"}->setValue($bugs[$i]['title']); 
-                if(isset($bugs[$i]['deadline'])) $form->dom->{"deadline[" . ($i + 1) . "]"}->datePicker($bugs[$i]['deadline']); 
-                if(isset($bugs[$i]['steps']))    $form->dom->{"steps[" . ($i + 1) . "]"}->setValue($bugs[$i]['steps']); 
-                if(isset($bugs[$i]['type']))     $form->dom->{"type[" . ($i + 1) . "]"}->picker($bugs[$i]['type']); 
-                if(isset($bugs[$i]['pri']))      $form->dom->{"pri[" . ($i + 1) . "]"}->picker($bugs[$i]['pri']); 
-                if(isset($bugs[$i]['severity'])) $form->dom->{"severity[" . ($i + 1) . "]"}->picker($bugs[$i]['severity']); 
-                if(isset($bugs[$i]['os']))       $form->dom->{"os[" . ($i + 1) . "]"}->multiPicker($bugs[$i]['os']); 
-                if(isset($bugs[$i]['browser']))  $form->dom->{"browser[" . ($i + 1) . "]"}->multiPicker($bugs[$i]['browser']); 
+                if(isset($bugs[$i]['title']))    $form->dom->{"title[" . ($i + 1) . "]"}->setValue($bugs[$i]['title']);
+                if(isset($bugs[$i]['deadline'])) $form->dom->{"deadline[" . ($i + 1) . "]"}->datePicker($bugs[$i]['deadline']);
+                if(isset($bugs[$i]['steps']))    $form->dom->{"steps[" . ($i + 1) . "]"}->setValue($bugs[$i]['steps']);
+                if(isset($bugs[$i]['type']))     $form->dom->{"type[" . ($i + 1) . "]"}->picker($bugs[$i]['type']);
+                if(isset($bugs[$i]['pri']))      $form->dom->{"pri[" . ($i + 1) . "]"}->picker($bugs[$i]['pri']);
+                if(isset($bugs[$i]['severity'])) $form->dom->{"severity[" . ($i + 1) . "]"}->picker($bugs[$i]['severity']);
+                if(isset($bugs[$i]['os']))       $form->dom->{"os[" . ($i + 1) . "]"}->multiPicker($bugs[$i]['os']);
+                if(isset($bugs[$i]['browser']))  $form->dom->{"browser[" . ($i + 1) . "]"}->multiPicker($bugs[$i]['browser']);
             }
         }
         $form->dom->save->click();
@@ -118,4 +118,4 @@ class createBugTester extends tester
             return $this->failed('bug列表页检查失败');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/module/bug/test/ui/batchcreate.php b/module/bug/test/ui/batchcreate.php
index a4b26b66a0..a691d2d3c0 100755
--- a/module/bug/test/ui/batchcreate.php
+++ b/module/bug/test/ui/batchcreate.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
-chdir(__DIR__);         
-include '../lib/createbug.ui.class.php'; 
+chdir(__DIR__);
+include '../lib/ui/createbug.ui.class.php';
 
 /**
 
@@ -33,4 +33,4 @@ $product['executionID'] = 0;
 $product['moduleID']    = 0;
 
 r($tester->batchCreate($product, $bugs)) && p('message,status') && e('批量创建bug成功,SUCCESS'); //批量创建bug
-$tester->closeBrowser();
\ No newline at end of file
+$tester->closeBrowser();
diff --git a/module/bug/test/ui/batchedit.php b/module/bug/test/ui/batchedit.php
index 542d0e30ae..b36d0536e2 100755
--- a/module/bug/test/ui/batchedit.php
+++ b/module/bug/test/ui/batchedit.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/createbug.ui.class.php';
+include '../lib/ui/createbug.ui.class.php';
 
 /**
 
diff --git a/module/bug/test/ui/browse.php b/module/bug/test/ui/browse.php
index 87c53c1fb5..9f17bc16dd 100755
--- a/module/bug/test/ui/browse.php
+++ b/module/bug/test/ui/browse.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/createbug.ui.class.php';
+include '../lib/ui/createbug.ui.class.php';
 
 /**
 
diff --git a/module/bug/test/ui/closebug.php b/module/bug/test/ui/closebug.php
index 5150e341e4..fe30c6a39c 100755
--- a/module/bug/test/ui/closebug.php
+++ b/module/bug/test/ui/closebug.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/confirmbug.ui.class.php';
+include '../lib/ui/confirmbug.ui.class.php';
 
 /**
 
diff --git a/module/bug/test/ui/confirmbug.php b/module/bug/test/ui/confirmbug.php
index c656538807..5fadf7a075 100755
--- a/module/bug/test/ui/confirmbug.php
+++ b/module/bug/test/ui/confirmbug.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/confirmbug.ui.class.php';
+include '../lib/ui/confirmbug.ui.class.php';
 
 /**
 
diff --git a/module/bug/test/ui/createbug.php b/module/bug/test/ui/createbug.php
index 250fb693ae..e17dd1f352 100755
--- a/module/bug/test/ui/createbug.php
+++ b/module/bug/test/ui/createbug.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
-chdir(__DIR__);         
-include '../lib/createbug.ui.class.php'; 
+chdir(__DIR__);
+include '../lib/ui/createbug.ui.class.php';
 
 /**
 
@@ -43,4 +43,4 @@ $bug['type']     = '设计缺陷';
 $bug['severity'] = 1;
 $bug['pri']      = 1;
 r($tester->createDefaultBug($project, $bug)) && p('message,status') && e('创建bug成功,SUCCESS'); //创建bug输入非必填项后提交表单
-$tester->closeBrowser();
\ No newline at end of file
+$tester->closeBrowser();
diff --git a/module/bug/test/ui/editbug.php b/module/bug/test/ui/editbug.php
index b0af94d8fb..9a344a8ee4 100755
--- a/module/bug/test/ui/editbug.php
+++ b/module/bug/test/ui/editbug.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/confirmbug.ui.class.php';
+include '../lib/ui/confirmbug.ui.class.php';
 
 /**
 
diff --git a/module/bug/test/ui/report.php b/module/bug/test/ui/report.php
index e93819358a..8a43bb7299 100755
--- a/module/bug/test/ui/report.php
+++ b/module/bug/test/ui/report.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/confirmbug.ui.class.php';
+include '../lib/ui/confirmbug.ui.class.php';
 
 /**
 
diff --git a/module/bug/test/ui/resolvebug.php b/module/bug/test/ui/resolvebug.php
index 06b565c4f9..6215ffab1f 100755
--- a/module/bug/test/ui/resolvebug.php
+++ b/module/bug/test/ui/resolvebug.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/confirmbug.ui.class.php';
+include '../lib/ui/confirmbug.ui.class.php';
 
 /**
 
diff --git a/module/caselib/test/lib/createcaselib.ui.class.php b/module/caselib/test/lib/ui/createcaselib.ui.class.php
similarity index 96%
rename from module/caselib/test/lib/createcaselib.ui.class.php
rename to module/caselib/test/lib/ui/createcaselib.ui.class.php
index b3cf7b02e7..921e57f3bc 100755
--- a/module/caselib/test/lib/createcaselib.ui.class.php
+++ b/module/caselib/test/lib/ui/createcaselib.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createCaselibTester extends tester
 {
     /**
diff --git a/module/caselib/test/lib/editcaselib.ui.class.php b/module/caselib/test/lib/ui/editcaselib.ui.class.php
similarity index 96%
rename from module/caselib/test/lib/editcaselib.ui.class.php
rename to module/caselib/test/lib/ui/editcaselib.ui.class.php
index 0575da65f8..ec6705bd84 100755
--- a/module/caselib/test/lib/editcaselib.ui.class.php
+++ b/module/caselib/test/lib/ui/editcaselib.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editCaselibTester extends tester
 {
     /**
diff --git a/module/caselib/test/ui/createcaselib.php b/module/caselib/test/ui/createcaselib.php
index d84ae2b024..18bbfb1789 100755
--- a/module/caselib/test/ui/createcaselib.php
+++ b/module/caselib/test/ui/createcaselib.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/createcaselib.ui.class.php';
+include '../lib/ui/createcaselib.ui.class.php';
 
 zenData('testsuite')->gen(0);
 
diff --git a/module/caselib/test/ui/editcaselib.php b/module/caselib/test/ui/editcaselib.php
index 9a62954ffc..94c530fb84 100755
--- a/module/caselib/test/ui/editcaselib.php
+++ b/module/caselib/test/ui/editcaselib.php
@@ -16,7 +16,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/editcaselib.ui.class.php';
+include '../lib/ui/editcaselib.ui.class.php';
 
 $caselib = zenData('testsuite');
 $caselib->id->range('1');
diff --git a/module/company/test/lib/editcompany.ui.class.php b/module/company/test/lib/ui/editcompany.ui.class.php
similarity index 95%
rename from module/company/test/lib/editcompany.ui.class.php
rename to module/company/test/lib/ui/editcompany.ui.class.php
index a4e6c46a1b..10c8fc06a7 100644
--- a/module/company/test/lib/editcompany.ui.class.php
+++ b/module/company/test/lib/ui/editcompany.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editCompanyTester extends tester
 {
     /**
diff --git a/module/company/test/ui/edit.php b/module/company/test/ui/edit.php
index 86c4c82ef0..b584b25c54 100644
--- a/module/company/test/ui/edit.php
+++ b/module/company/test/ui/edit.php
@@ -17,7 +17,7 @@ cid=2
 */
 
 chdir(__DIR__);
-include '../lib/editcompany.ui.class.php';
+include '../lib/ui/editcompany.ui.class.php';
 
 $tester = new editCompanyTester();
 $tester->login();
diff --git a/module/design/test/lib/assigndesign.ui.class.php b/module/design/test/lib/ui/assigndesign.ui.class.php
similarity index 94%
rename from module/design/test/lib/assigndesign.ui.class.php
rename to module/design/test/lib/ui/assigndesign.ui.class.php
index 7c87610b1c..567bb49deb 100644
--- a/module/design/test/lib/assigndesign.ui.class.php
+++ b/module/design/test/lib/ui/assigndesign.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class assignDesignTester extends tester
 {
     /**
diff --git a/module/design/test/lib/batchcreatedesign.ui.class.php b/module/design/test/lib/ui/batchcreatedesign.ui.class.php
similarity index 95%
rename from module/design/test/lib/batchcreatedesign.ui.class.php
rename to module/design/test/lib/ui/batchcreatedesign.ui.class.php
index 7384672983..7031bf6c36 100644
--- a/module/design/test/lib/batchcreatedesign.ui.class.php
+++ b/module/design/test/lib/ui/batchcreatedesign.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchCreateDesignTester extends tester
 {
     /**
diff --git a/module/design/test/lib/browse.ui.class.php b/module/design/test/lib/ui/browse.ui.class.php
similarity index 97%
rename from module/design/test/lib/browse.ui.class.php
rename to module/design/test/lib/ui/browse.ui.class.php
index 3e0033ce45..2dd8fffeb5 100755
--- a/module/design/test/lib/browse.ui.class.php
+++ b/module/design/test/lib/ui/browse.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTester extends tester
 {
     /**
diff --git a/module/design/test/lib/createdesign.ui.class.php b/module/design/test/lib/ui/createdesign.ui.class.php
similarity index 97%
rename from module/design/test/lib/createdesign.ui.class.php
rename to module/design/test/lib/ui/createdesign.ui.class.php
index 773e3a4a59..c4b3e388dd 100644
--- a/module/design/test/lib/createdesign.ui.class.php
+++ b/module/design/test/lib/ui/createdesign.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createDesignTester extends tester
 {
     /**
diff --git a/module/design/test/lib/deletedesign.ui.class.php b/module/design/test/lib/ui/deletedesign.ui.class.php
similarity index 94%
rename from module/design/test/lib/deletedesign.ui.class.php
rename to module/design/test/lib/ui/deletedesign.ui.class.php
index a79e307669..f05764f75d 100644
--- a/module/design/test/lib/deletedesign.ui.class.php
+++ b/module/design/test/lib/ui/deletedesign.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class deleteDesignTester extends tester
 {
     /**
diff --git a/module/design/test/lib/editdesign.ui.class.php b/module/design/test/lib/ui/editdesign.ui.class.php
similarity index 97%
rename from module/design/test/lib/editdesign.ui.class.php
rename to module/design/test/lib/ui/editdesign.ui.class.php
index 1062d2ef4e..3e892b39be 100644
--- a/module/design/test/lib/editdesign.ui.class.php
+++ b/module/design/test/lib/ui/editdesign.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editDesignTester extends tester
 {
     /**
diff --git a/module/design/test/lib/linkcommit.ui.class.php b/module/design/test/lib/ui/linkcommit.ui.class.php
similarity index 95%
rename from module/design/test/lib/linkcommit.ui.class.php
rename to module/design/test/lib/ui/linkcommit.ui.class.php
index ef3b330f00..d82b5459d6 100755
--- a/module/design/test/lib/linkcommit.ui.class.php
+++ b/module/design/test/lib/ui/linkcommit.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class linkCommitTester extends tester
 {
     /**
diff --git a/module/design/test/lib/view.ui.class.php b/module/design/test/lib/ui/view.ui.class.php
similarity index 96%
rename from module/design/test/lib/view.ui.class.php
rename to module/design/test/lib/ui/view.ui.class.php
index 9b7cc8892c..919547af2d 100644
--- a/module/design/test/lib/view.ui.class.php
+++ b/module/design/test/lib/ui/view.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewTester extends tester
 {
     /**
diff --git a/module/design/test/lib/viewcommit.ui.class.php b/module/design/test/lib/ui/viewcommit.ui.class.php
similarity index 93%
rename from module/design/test/lib/viewcommit.ui.class.php
rename to module/design/test/lib/ui/viewcommit.ui.class.php
index 53d863ac5a..635a895b03 100755
--- a/module/design/test/lib/viewcommit.ui.class.php
+++ b/module/design/test/lib/ui/viewcommit.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewCommitTester extends tester
 {
     /**
diff --git a/module/design/test/ui/assigndesign.php b/module/design/test/ui/assigndesign.php
index 54f28fe49b..0834fb7397 100755
--- a/module/design/test/ui/assigndesign.php
+++ b/module/design/test/ui/assigndesign.php
@@ -11,7 +11,7 @@ cid=2
 
 */
 chdir(__DIR__);
-include '../lib/assigndesign.ui.class.php';
+include '../lib/ui/assigndesign.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 zendata('design')->loadYaml('design', false, 2)->gen(2);
diff --git a/module/design/test/ui/batchcreatedesign.php b/module/design/test/ui/batchcreatedesign.php
index 8f9c11bd44..2de5f66af1 100755
--- a/module/design/test/ui/batchcreatedesign.php
+++ b/module/design/test/ui/batchcreatedesign.php
@@ -12,7 +12,7 @@ cid=4
 
 */
 chdir(__DIR__);
-include '../lib/batchcreatedesign.ui.class.php';
+include '../lib/ui/batchcreatedesign.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 zendata('design')->loadYaml('design', false, 2)->gen(0);
diff --git a/module/design/test/ui/browse.php b/module/design/test/ui/browse.php
index 0cce2713f7..4ad086a6f7 100755
--- a/module/design/test/ui/browse.php
+++ b/module/design/test/ui/browse.php
@@ -16,7 +16,7 @@ cid=10
 
 */
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 $project = zendata('project');
 $project->id->range('1');
diff --git a/module/design/test/ui/createdesign.php b/module/design/test/ui/createdesign.php
index c87edb261d..e2c87c7a6a 100755
--- a/module/design/test/ui/createdesign.php
+++ b/module/design/test/ui/createdesign.php
@@ -18,7 +18,7 @@ cid=1
 
 */
 chdir(__DIR__);
-include '../lib/createdesign.ui.class.php';
+include '../lib/ui/createdesign.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 $tester = new createDesignTester();
diff --git a/module/design/test/ui/deletedesign.php b/module/design/test/ui/deletedesign.php
index e2feef7965..81e2a545de 100755
--- a/module/design/test/ui/deletedesign.php
+++ b/module/design/test/ui/deletedesign.php
@@ -11,7 +11,7 @@ cid=7
 
 */
 chdir(__DIR__);
-include '../lib/deletedesign.ui.class.php';
+include '../lib/ui/deletedesign.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 zendata('design')->loadYaml('design', false, 2)->gen(2);
diff --git a/module/design/test/ui/editdesign.php b/module/design/test/ui/editdesign.php
index cf8f33bfa0..0063ee5f3f 100755
--- a/module/design/test/ui/editdesign.php
+++ b/module/design/test/ui/editdesign.php
@@ -17,7 +17,7 @@ cid=2
 
 */
 chdir(__DIR__);
-include '../lib/editdesign.ui.class.php';
+include '../lib/ui/editdesign.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 zendata('design')->loadYaml('design', false, 2)->gen(2);
diff --git a/module/design/test/ui/linkcommit.php b/module/design/test/ui/linkcommit.php
index e1f6d342d5..92ae8f870f 100755
--- a/module/design/test/ui/linkcommit.php
+++ b/module/design/test/ui/linkcommit.php
@@ -12,7 +12,7 @@ cid=9
 */
 
 chdir(__DIR__);
-include '../lib/linkcommit.ui.class.php';
+include '../lib/ui/linkcommit.ui.class.php';
 
 $project = zendata('project');
 $project->id->range('1');
diff --git a/module/design/test/ui/view.php b/module/design/test/ui/view.php
index 54098932d0..44d644c19b 100755
--- a/module/design/test/ui/view.php
+++ b/module/design/test/ui/view.php
@@ -11,7 +11,7 @@ cid=6
 
 */
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 zendata('design')->loadYaml('design', false, 2)->gen(2);
diff --git a/module/design/test/ui/viewcommit.php b/module/design/test/ui/viewcommit.php
index 701e71e634..d5ce7db35b 100755
--- a/module/design/test/ui/viewcommit.php
+++ b/module/design/test/ui/viewcommit.php
@@ -12,7 +12,7 @@ cid=8
 */
 
 chdir(__DIR__);
-include '../lib/viewcommit.ui.class.php';
+include '../lib/ui/viewcommit.ui.class.php';
 
 $project = zendata('project');
 $project->id->range('1');
diff --git a/module/doc/test/lib/createspace.ui.class.php b/module/doc/test/lib/ui/createspace.ui.class.php
similarity index 96%
rename from module/doc/test/lib/createspace.ui.class.php
rename to module/doc/test/lib/ui/createspace.ui.class.php
index f6b555642b..6c2fbb27f9 100644
--- a/module/doc/test/lib/createspace.ui.class.php
+++ b/module/doc/test/lib/ui/createspace.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createSpaceTester extends tester
 {
     /**
diff --git a/module/doc/test/ui/createspace.php b/module/doc/test/ui/createspace.php
index f67089266c..a08c29da11 100644
--- a/module/doc/test/ui/createspace.php
+++ b/module/doc/test/ui/createspace.php
@@ -22,7 +22,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/createspace.ui.class.php';
+include '../lib/ui/createspace.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/epic/test/lib/batchcreatur.ui.class.php b/module/epic/test/lib/ui/batchcreatur.ui.class.php
similarity index 98%
rename from module/epic/test/lib/batchcreatur.ui.class.php
rename to module/epic/test/lib/ui/batchcreatur.ui.class.php
index 5e71b2c2cc..53618b181a 100644
--- a/module/epic/test/lib/batchcreatur.ui.class.php
+++ b/module/epic/test/lib/ui/batchcreatur.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     epic
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class createChildStoryTester extends tester
 {
     public function checkDisplay($storyName)
diff --git a/module/epic/test/lib/closeepic.ui.class.php b/module/epic/test/lib/ui/closeepic.ui.class.php
similarity index 98%
rename from module/epic/test/lib/closeepic.ui.class.php
rename to module/epic/test/lib/ui/closeepic.ui.class.php
index 395c4e6704..fa8e5cb83a 100644
--- a/module/epic/test/lib/closeepic.ui.class.php
+++ b/module/epic/test/lib/ui/closeepic.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 /**
     * The control file of example module of ZenTaoPMS.
     *
diff --git a/module/epic/test/ui/batchcreateur.php b/module/epic/test/ui/batchcreateur.php
index 8ef41808e1..840864bea5 100644
--- a/module/epic/test/ui/batchcreateur.php
+++ b/module/epic/test/ui/batchcreateur.php
@@ -21,7 +21,7 @@ cid=79
  -测试结果 @拆分业务需求成功
 */
 chdir(__DIR__);
-include '../lib/batchcreatur.ui.class.php';
+include '../lib/ui/batchcreatur.ui.class.php';
 include '../../../requirement/test/ui/page/batchcreate.php';
 include '../../../requirement/test/ui/page/view.php';
 
diff --git a/module/epic/test/ui/closeepic.php b/module/epic/test/ui/closeepic.php
index 2cf82308f6..0878da2668 100755
--- a/module/epic/test/ui/closeepic.php
+++ b/module/epic/test/ui/closeepic.php
@@ -10,7 +10,7 @@ cid=90
 
 */
 chdir (__DIR__);
-include '../lib/closeepic.ui.class.php';
+include '../lib/ui/closeepic.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/execution/test/lib/activateexecution.ui.class.php b/module/execution/test/lib/ui/activateexecution.ui.class.php
similarity index 98%
rename from module/execution/test/lib/activateexecution.ui.class.php
rename to module/execution/test/lib/ui/activateexecution.ui.class.php
index 78bec509a5..4410ef9ce7 100644
--- a/module/execution/test/lib/activateexecution.ui.class.php
+++ b/module/execution/test/lib/ui/activateexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class activateExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/activateinlite.ui.class.php b/module/execution/test/lib/ui/activateinlite.ui.class.php
similarity index 98%
rename from module/execution/test/lib/activateinlite.ui.class.php
rename to module/execution/test/lib/ui/activateinlite.ui.class.php
index 2f58182916..520774876c 100644
--- a/module/execution/test/lib/activateinlite.ui.class.php
+++ b/module/execution/test/lib/ui/activateinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class activateExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/allexecution.ui.class.php b/module/execution/test/lib/ui/allexecution.ui.class.php
similarity index 97%
rename from module/execution/test/lib/allexecution.ui.class.php
rename to module/execution/test/lib/ui/allexecution.ui.class.php
index ffd519424c..9132c00d8f 100755
--- a/module/execution/test/lib/allexecution.ui.class.php
+++ b/module/execution/test/lib/ui/allexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class allExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/batchedit.ui.class.php b/module/execution/test/lib/ui/batchedit.ui.class.php
similarity index 99%
rename from module/execution/test/lib/batchedit.ui.class.php
rename to module/execution/test/lib/ui/batchedit.ui.class.php
index ddbb05295b..c26a1fa4ac 100755
--- a/module/execution/test/lib/batchedit.ui.class.php
+++ b/module/execution/test/lib/ui/batchedit.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) .'/test/lib/ui.php';
+include dirname(__FILE__, 6) .'/test/lib/ui.php';
 class batchEditTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/bug.ui.class.php b/module/execution/test/lib/ui/bug.ui.class.php
similarity index 98%
rename from module/execution/test/lib/bug.ui.class.php
rename to module/execution/test/lib/ui/bug.ui.class.php
index 1987191847..57656155d1 100644
--- a/module/execution/test/lib/bug.ui.class.php
+++ b/module/execution/test/lib/ui/bug.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class bugTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/build.ui.class.php b/module/execution/test/lib/ui/build.ui.class.php
similarity index 93%
rename from module/execution/test/lib/build.ui.class.php
rename to module/execution/test/lib/ui/build.ui.class.php
index 95f6611a58..2e52a1c244 100644
--- a/module/execution/test/lib/build.ui.class.php
+++ b/module/execution/test/lib/ui/build.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class buildTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/closeexecution.ui.class.php b/module/execution/test/lib/ui/closeexecution.ui.class.php
similarity index 98%
rename from module/execution/test/lib/closeexecution.ui.class.php
rename to module/execution/test/lib/ui/closeexecution.ui.class.php
index 4914fdf831..479789e250 100644
--- a/module/execution/test/lib/closeexecution.ui.class.php
+++ b/module/execution/test/lib/ui/closeexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class closeExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/closeinlite.ui.class.php b/module/execution/test/lib/ui/closeinlite.ui.class.php
similarity index 98%
rename from module/execution/test/lib/closeinlite.ui.class.php
rename to module/execution/test/lib/ui/closeinlite.ui.class.php
index a283b9e152..5382441611 100644
--- a/module/execution/test/lib/closeinlite.ui.class.php
+++ b/module/execution/test/lib/ui/closeinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class closeExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/createexecution.ui.class.php b/module/execution/test/lib/ui/createexecution.ui.class.php
similarity index 99%
rename from module/execution/test/lib/createexecution.ui.class.php
rename to module/execution/test/lib/ui/createexecution.ui.class.php
index 6c4151630f..c29fc3c4c6 100755
--- a/module/execution/test/lib/createexecution.ui.class.php
+++ b/module/execution/test/lib/ui/createexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/createinlite.ui.class.php b/module/execution/test/lib/ui/createinlite.ui.class.php
similarity index 99%
rename from module/execution/test/lib/createinlite.ui.class.php
rename to module/execution/test/lib/ui/createinlite.ui.class.php
index 55f9d269bc..666e38a309 100755
--- a/module/execution/test/lib/createinlite.ui.class.php
+++ b/module/execution/test/lib/ui/createinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/delete.ui.class.php b/module/execution/test/lib/ui/delete.ui.class.php
similarity index 94%
rename from module/execution/test/lib/delete.ui.class.php
rename to module/execution/test/lib/ui/delete.ui.class.php
index 308309a972..73898f2817 100644
--- a/module/execution/test/lib/delete.ui.class.php
+++ b/module/execution/test/lib/ui/delete.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class deleteExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/dynamic.ui.class.php b/module/execution/test/lib/ui/dynamic.ui.class.php
similarity index 96%
rename from module/execution/test/lib/dynamic.ui.class.php
rename to module/execution/test/lib/ui/dynamic.ui.class.php
index b135ba8fe0..11d323ddb7 100644
--- a/module/execution/test/lib/dynamic.ui.class.php
+++ b/module/execution/test/lib/ui/dynamic.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class dynamicTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/editexecution.ui.class.php b/module/execution/test/lib/ui/editexecution.ui.class.php
similarity index 99%
rename from module/execution/test/lib/editexecution.ui.class.php
rename to module/execution/test/lib/ui/editexecution.ui.class.php
index d781aeff00..a9a6365011 100644
--- a/module/execution/test/lib/editexecution.ui.class.php
+++ b/module/execution/test/lib/ui/editexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/editinlite.ui.class.php b/module/execution/test/lib/ui/editinlite.ui.class.php
similarity index 99%
rename from module/execution/test/lib/editinlite.ui.class.php
rename to module/execution/test/lib/ui/editinlite.ui.class.php
index ae76ba68e5..da63326554 100755
--- a/module/execution/test/lib/editinlite.ui.class.php
+++ b/module/execution/test/lib/ui/editinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/executionkanban.ui.class.php b/module/execution/test/lib/ui/executionkanban.ui.class.php
similarity index 94%
rename from module/execution/test/lib/executionkanban.ui.class.php
rename to module/execution/test/lib/ui/executionkanban.ui.class.php
index 80e6dba86c..dfaa05abb1 100644
--- a/module/execution/test/lib/executionkanban.ui.class.php
+++ b/module/execution/test/lib/ui/executionkanban.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class executionkanbanTester extends tester
 {
     /*
diff --git a/module/execution/test/lib/grouptask.ui.class.php b/module/execution/test/lib/ui/grouptask.ui.class.php
similarity index 98%
rename from module/execution/test/lib/grouptask.ui.class.php
rename to module/execution/test/lib/ui/grouptask.ui.class.php
index a901313c50..7d15cc1b43 100644
--- a/module/execution/test/lib/grouptask.ui.class.php
+++ b/module/execution/test/lib/ui/grouptask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class grouptaskTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/grouptaskinlite.ui.class.php b/module/execution/test/lib/ui/grouptaskinlite.ui.class.php
similarity index 98%
rename from module/execution/test/lib/grouptaskinlite.ui.class.php
rename to module/execution/test/lib/ui/grouptaskinlite.ui.class.php
index ff440bb7ed..c728c44699 100644
--- a/module/execution/test/lib/grouptaskinlite.ui.class.php
+++ b/module/execution/test/lib/ui/grouptaskinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class grouptaskTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/importbug.ui.class.php b/module/execution/test/lib/ui/importbug.ui.class.php
similarity index 96%
rename from module/execution/test/lib/importbug.ui.class.php
rename to module/execution/test/lib/ui/importbug.ui.class.php
index 7cc026d72c..192d36c544 100644
--- a/module/execution/test/lib/importbug.ui.class.php
+++ b/module/execution/test/lib/ui/importbug.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class importBugTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/importtask.ui.class.php b/module/execution/test/lib/ui/importtask.ui.class.php
similarity index 97%
rename from module/execution/test/lib/importtask.ui.class.php
rename to module/execution/test/lib/ui/importtask.ui.class.php
index 2bb3d6dde7..8c3f3cc309 100644
--- a/module/execution/test/lib/importtask.ui.class.php
+++ b/module/execution/test/lib/ui/importtask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class importTaskTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/kanbaninlite.ui.class.php b/module/execution/test/lib/ui/kanbaninlite.ui.class.php
similarity index 96%
rename from module/execution/test/lib/kanbaninlite.ui.class.php
rename to module/execution/test/lib/ui/kanbaninlite.ui.class.php
index 9af9be12f7..40827c2a4b 100644
--- a/module/execution/test/lib/kanbaninlite.ui.class.php
+++ b/module/execution/test/lib/ui/kanbaninlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class kanbanTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/linkstory.ui.class.php b/module/execution/test/lib/ui/linkstory.ui.class.php
similarity index 96%
rename from module/execution/test/lib/linkstory.ui.class.php
rename to module/execution/test/lib/ui/linkstory.ui.class.php
index 14dbcac6c0..4b6a22f27b 100755
--- a/module/execution/test/lib/linkstory.ui.class.php
+++ b/module/execution/test/lib/ui/linkstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class linkStoryTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/managemembers.ui.class.php b/module/execution/test/lib/ui/managemembers.ui.class.php
similarity index 98%
rename from module/execution/test/lib/managemembers.ui.class.php
rename to module/execution/test/lib/ui/managemembers.ui.class.php
index 7a29f6a76f..e83bfc811c 100755
--- a/module/execution/test/lib/managemembers.ui.class.php
+++ b/module/execution/test/lib/ui/managemembers.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class manageMembersTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/manageproducts.ui.class.php b/module/execution/test/lib/ui/manageproducts.ui.class.php
similarity index 97%
rename from module/execution/test/lib/manageproducts.ui.class.php
rename to module/execution/test/lib/ui/manageproducts.ui.class.php
index bfdf6c1339..5e2cf343ef 100644
--- a/module/execution/test/lib/manageproducts.ui.class.php
+++ b/module/execution/test/lib/ui/manageproducts.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class manageProductsTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/putoffexecution.ui.class.php b/module/execution/test/lib/ui/putoffexecution.ui.class.php
similarity index 98%
rename from module/execution/test/lib/putoffexecution.ui.class.php
rename to module/execution/test/lib/ui/putoffexecution.ui.class.php
index c7d4ba8587..2255a07dbe 100644
--- a/module/execution/test/lib/putoffexecution.ui.class.php
+++ b/module/execution/test/lib/ui/putoffexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class putoffExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/putoffinlite.ui.class.php b/module/execution/test/lib/ui/putoffinlite.ui.class.php
similarity index 99%
rename from module/execution/test/lib/putoffinlite.ui.class.php
rename to module/execution/test/lib/ui/putoffinlite.ui.class.php
index 480b1f3330..4f449c1d39 100644
--- a/module/execution/test/lib/putoffinlite.ui.class.php
+++ b/module/execution/test/lib/ui/putoffinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class putoffExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/startexecution.ui.class.php b/module/execution/test/lib/ui/startexecution.ui.class.php
similarity index 97%
rename from module/execution/test/lib/startexecution.ui.class.php
rename to module/execution/test/lib/ui/startexecution.ui.class.php
index 3a5e137c6b..fd9f148749 100644
--- a/module/execution/test/lib/startexecution.ui.class.php
+++ b/module/execution/test/lib/ui/startexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class startExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/startinlite.ui.class.php b/module/execution/test/lib/ui/startinlite.ui.class.php
similarity index 97%
rename from module/execution/test/lib/startinlite.ui.class.php
rename to module/execution/test/lib/ui/startinlite.ui.class.php
index eac5b038ab..ac5174372d 100644
--- a/module/execution/test/lib/startinlite.ui.class.php
+++ b/module/execution/test/lib/ui/startinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class startExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/story.ui.class.php b/module/execution/test/lib/ui/story.ui.class.php
similarity index 99%
rename from module/execution/test/lib/story.ui.class.php
rename to module/execution/test/lib/ui/story.ui.class.php
index 4b80fb5b35..f77dc5e355 100755
--- a/module/execution/test/lib/story.ui.class.php
+++ b/module/execution/test/lib/ui/story.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class storyTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/storyestimate.ui.class.php b/module/execution/test/lib/ui/storyestimate.ui.class.php
similarity index 98%
rename from module/execution/test/lib/storyestimate.ui.class.php
rename to module/execution/test/lib/ui/storyestimate.ui.class.php
index 9b8d415e62..7ae46d0c95 100644
--- a/module/execution/test/lib/storyestimate.ui.class.php
+++ b/module/execution/test/lib/ui/storyestimate.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class StoryEstimateTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/storykanban.ui.class.php b/module/execution/test/lib/ui/storykanban.ui.class.php
similarity index 93%
rename from module/execution/test/lib/storykanban.ui.class.php
rename to module/execution/test/lib/ui/storykanban.ui.class.php
index c65f7c3710..9d105b5f47 100644
--- a/module/execution/test/lib/storykanban.ui.class.php
+++ b/module/execution/test/lib/ui/storykanban.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class storykanbanTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/suspendexecution.ui.class.php b/module/execution/test/lib/ui/suspendexecution.ui.class.php
similarity index 93%
rename from module/execution/test/lib/suspendexecution.ui.class.php
rename to module/execution/test/lib/ui/suspendexecution.ui.class.php
index 35983b9015..67c622dd75 100644
--- a/module/execution/test/lib/suspendexecution.ui.class.php
+++ b/module/execution/test/lib/ui/suspendexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class suspendExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/suspendinlite.ui.class.php b/module/execution/test/lib/ui/suspendinlite.ui.class.php
similarity index 95%
rename from module/execution/test/lib/suspendinlite.ui.class.php
rename to module/execution/test/lib/ui/suspendinlite.ui.class.php
index b46cacbec2..64186c4ff3 100644
--- a/module/execution/test/lib/suspendinlite.ui.class.php
+++ b/module/execution/test/lib/ui/suspendinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class suspendExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/taskexecution.ui.class.php b/module/execution/test/lib/ui/taskexecution.ui.class.php
similarity index 98%
rename from module/execution/test/lib/taskexecution.ui.class.php
rename to module/execution/test/lib/ui/taskexecution.ui.class.php
index cf15c2eb86..e12a855f4b 100755
--- a/module/execution/test/lib/taskexecution.ui.class.php
+++ b/module/execution/test/lib/ui/taskexecution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class taskExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/taskinlite.ui.class.php b/module/execution/test/lib/ui/taskinlite.ui.class.php
similarity index 98%
rename from module/execution/test/lib/taskinlite.ui.class.php
rename to module/execution/test/lib/ui/taskinlite.ui.class.php
index 3f8bed2bf9..0cd40580f2 100755
--- a/module/execution/test/lib/taskinlite.ui.class.php
+++ b/module/execution/test/lib/ui/taskinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class taskExecutionTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/taskkanban.ui.class.php b/module/execution/test/lib/ui/taskkanban.ui.class.php
similarity index 96%
rename from module/execution/test/lib/taskkanban.ui.class.php
rename to module/execution/test/lib/ui/taskkanban.ui.class.php
index 5bbdfebcb3..0f3412069c 100644
--- a/module/execution/test/lib/taskkanban.ui.class.php
+++ b/module/execution/test/lib/ui/taskkanban.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class taskkanbanTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/testcase.ui.class.php b/module/execution/test/lib/ui/testcase.ui.class.php
similarity index 93%
rename from module/execution/test/lib/testcase.ui.class.php
rename to module/execution/test/lib/ui/testcase.ui.class.php
index 4031d581c6..f9aceafbb5 100644
--- a/module/execution/test/lib/testcase.ui.class.php
+++ b/module/execution/test/lib/ui/testcase.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class testcaseTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/testtask.ui.class.php b/module/execution/test/lib/ui/testtask.ui.class.php
similarity index 97%
rename from module/execution/test/lib/testtask.ui.class.php
rename to module/execution/test/lib/ui/testtask.ui.class.php
index c841c4268e..8507a6f79b 100644
--- a/module/execution/test/lib/testtask.ui.class.php
+++ b/module/execution/test/lib/ui/testtask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class testtaskTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/tree.ui.class.php b/module/execution/test/lib/ui/tree.ui.class.php
similarity index 96%
rename from module/execution/test/lib/tree.ui.class.php
rename to module/execution/test/lib/ui/tree.ui.class.php
index 5d165f52ec..cb73b161a4 100644
--- a/module/execution/test/lib/tree.ui.class.php
+++ b/module/execution/test/lib/ui/tree.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class treeTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/treeinlite.ui.class.php b/module/execution/test/lib/ui/treeinlite.ui.class.php
similarity index 96%
rename from module/execution/test/lib/treeinlite.ui.class.php
rename to module/execution/test/lib/ui/treeinlite.ui.class.php
index 689e2543ab..f9d215f1a0 100644
--- a/module/execution/test/lib/treeinlite.ui.class.php
+++ b/module/execution/test/lib/ui/treeinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class treeTester extends tester
 {
     /**
diff --git a/module/execution/test/lib/view.ui.class.php b/module/execution/test/lib/ui/view.ui.class.php
similarity index 98%
rename from module/execution/test/lib/view.ui.class.php
rename to module/execution/test/lib/ui/view.ui.class.php
index a4b76d5dc4..ecaa776eda 100644
--- a/module/execution/test/lib/view.ui.class.php
+++ b/module/execution/test/lib/ui/view.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewTester extends tester
 {
     /**
diff --git a/module/execution/test/ui/activateexecution.php b/module/execution/test/ui/activateexecution.php
index 92f41698b8..7d4f66e159 100644
--- a/module/execution/test/ui/activateexecution.php
+++ b/module/execution/test/ui/activateexecution.php
@@ -26,7 +26,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/activateexecution.ui.class.php';
+include '../lib/ui/activateexecution.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/activateinlite.php b/module/execution/test/ui/activateinlite.php
index b105ea3dc2..68f3edb1c4 100644
--- a/module/execution/test/ui/activateinlite.php
+++ b/module/execution/test/ui/activateinlite.php
@@ -25,7 +25,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/activateinlite.ui.class.php';
+include '../lib/ui/activateinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/allexecution.php b/module/execution/test/ui/allexecution.php
index 03388f0947..d6dc81b438 100755
--- a/module/execution/test/ui/allexecution.php
+++ b/module/execution/test/ui/allexecution.php
@@ -44,7 +44,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/allexecution.ui.class.php';
+include '../lib/ui/allexecution.ui.class.php';
 
 $project = zendata('project');
 $project->id->range('1-2');
diff --git a/module/execution/test/ui/batchedit.php b/module/execution/test/ui/batchedit.php
index 8e169b04a6..d67b4af891 100755
--- a/module/execution/test/ui/batchedit.php
+++ b/module/execution/test/ui/batchedit.php
@@ -35,7 +35,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/batchedit.ui.class.php';
+include '../lib/ui/batchedit.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-2');
diff --git a/module/execution/test/ui/bug.php b/module/execution/test/ui/bug.php
index e999cb2c04..df93ddbedc 100644
--- a/module/execution/test/ui/bug.php
+++ b/module/execution/test/ui/bug.php
@@ -32,7 +32,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/bug.ui.class.php';
+include '../lib/ui/bug.ui.class.php';
 global $config;
 
 $product = zenData('product');
diff --git a/module/execution/test/ui/build.php b/module/execution/test/ui/build.php
index 86a366feac..c437306744 100644
--- a/module/execution/test/ui/build.php
+++ b/module/execution/test/ui/build.php
@@ -20,7 +20,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/build.ui.class.php';
+include '../lib/ui/build.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/execution/test/ui/closeexecution.php b/module/execution/test/ui/closeexecution.php
index 54137c333e..9ee4d534ed 100644
--- a/module/execution/test/ui/closeexecution.php
+++ b/module/execution/test/ui/closeexecution.php
@@ -20,7 +20,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/closeexecution.ui.class.php';
+include '../lib/ui/closeexecution.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/execution/test/ui/closeinlite.php b/module/execution/test/ui/closeinlite.php
index 8c6027dc4e..3f20f7dc9f 100644
--- a/module/execution/test/ui/closeinlite.php
+++ b/module/execution/test/ui/closeinlite.php
@@ -19,7 +19,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/closeinlite.ui.class.php';
+include '../lib/ui/closeinlite.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/execution/test/ui/createexecution.php b/module/execution/test/ui/createexecution.php
index 97340e599d..280c4998cd 100755
--- a/module/execution/test/ui/createexecution.php
+++ b/module/execution/test/ui/createexecution.php
@@ -44,7 +44,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/createexecution.ui.class.php';
+include '../lib/ui/createexecution.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/createinlite.php b/module/execution/test/ui/createinlite.php
index 5a959f4afb..45d9d06038 100755
--- a/module/execution/test/ui/createinlite.php
+++ b/module/execution/test/ui/createinlite.php
@@ -41,7 +41,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/createinlite.ui.class.php';
+include '../lib/ui/createinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/delete.php b/module/execution/test/ui/delete.php
index 114c0c5b85..f28c36a8ae 100644
--- a/module/execution/test/ui/delete.php
+++ b/module/execution/test/ui/delete.php
@@ -14,7 +14,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/delete.ui.class.php';
+include '../lib/ui/delete.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/dynamic.php b/module/execution/test/ui/dynamic.php
index 6e12110a2c..5a0d953b22 100644
--- a/module/execution/test/ui/dynamic.php
+++ b/module/execution/test/ui/dynamic.php
@@ -17,7 +17,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/dynamic.ui.class.php';
+include '../lib/ui/dynamic.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/execution/test/ui/editexecution.php b/module/execution/test/ui/editexecution.php
index 2b7ee07b36..8df91d0575 100755
--- a/module/execution/test/ui/editexecution.php
+++ b/module/execution/test/ui/editexecution.php
@@ -44,7 +44,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/editexecution.ui.class.php';
+include '../lib/ui/editexecution.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-10');
diff --git a/module/execution/test/ui/editinlite.php b/module/execution/test/ui/editinlite.php
index f71e5a622b..be97dde29c 100755
--- a/module/execution/test/ui/editinlite.php
+++ b/module/execution/test/ui/editinlite.php
@@ -32,7 +32,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/editinlite.ui.class.php';
+include '../lib/ui/editinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/executionkanban.php b/module/execution/test/ui/executionkanban.php
index 359922b63a..7ba0596174 100644
--- a/module/execution/test/ui/executionkanban.php
+++ b/module/execution/test/ui/executionkanban.php
@@ -14,7 +14,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/executionkanban.ui.class.php';
+include '../lib/ui/executionkanban.ui.class.php';
 global $config;
 
 $project = zenData('project');
diff --git a/module/execution/test/ui/grouptask.php b/module/execution/test/ui/grouptask.php
index 72bc3db1c1..862db437cf 100644
--- a/module/execution/test/ui/grouptask.php
+++ b/module/execution/test/ui/grouptask.php
@@ -38,7 +38,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/grouptask.ui.class.php';
+include '../lib/ui/grouptask.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/execution/test/ui/grouptaskinlite.php b/module/execution/test/ui/grouptaskinlite.php
index c17cb14488..cda70f24ea 100644
--- a/module/execution/test/ui/grouptaskinlite.php
+++ b/module/execution/test/ui/grouptaskinlite.php
@@ -38,7 +38,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/grouptaskinlite.ui.class.php';
+include '../lib/ui/grouptaskinlite.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/execution/test/ui/importbug.php b/module/execution/test/ui/importbug.php
index b5e7aff7d3..3d1c530f51 100644
--- a/module/execution/test/ui/importbug.php
+++ b/module/execution/test/ui/importbug.php
@@ -23,7 +23,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/importbug.ui.class.php';
+include '../lib/ui/importbug.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/execution/test/ui/importtask.php b/module/execution/test/ui/importtask.php
index eb317d254f..cfa5cb157c 100644
--- a/module/execution/test/ui/importtask.php
+++ b/module/execution/test/ui/importtask.php
@@ -32,7 +32,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/importtask.ui.class.php';
+include '../lib/ui/importtask.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/kanbaninlite.php b/module/execution/test/ui/kanbaninlite.php
index 5ceef881df..c8a017d46f 100755
--- a/module/execution/test/ui/kanbaninlite.php
+++ b/module/execution/test/ui/kanbaninlite.php
@@ -83,7 +83,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/kanbaninlite.ui.class.php';
+include '../lib/ui/kanbaninlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/linkstory.php b/module/execution/test/ui/linkstory.php
index af3e0f9747..aa14321f05 100755
--- a/module/execution/test/ui/linkstory.php
+++ b/module/execution/test/ui/linkstory.php
@@ -17,7 +17,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/linkstory.ui.class.php';
+include '../lib/ui/linkstory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/execution/test/ui/managemembers.php b/module/execution/test/ui/managemembers.php
index f5f6e8e894..c8b19433ce 100644
--- a/module/execution/test/ui/managemembers.php
+++ b/module/execution/test/ui/managemembers.php
@@ -26,7 +26,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/managemembers.ui.class.php';
+include '../lib/ui/managemembers.ui.class.php';
 global $config;
 
 $project = zenData('project');
diff --git a/module/execution/test/ui/manageproducts.php b/module/execution/test/ui/manageproducts.php
index 16e2ed6609..f5b3e71ed3 100644
--- a/module/execution/test/ui/manageproducts.php
+++ b/module/execution/test/ui/manageproducts.php
@@ -29,7 +29,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/manageproducts.ui.class.php';
+include '../lib/ui/manageproducts.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-5');
diff --git a/module/execution/test/ui/putoffexecution.php b/module/execution/test/ui/putoffexecution.php
index 370c67cf89..485cb702de 100644
--- a/module/execution/test/ui/putoffexecution.php
+++ b/module/execution/test/ui/putoffexecution.php
@@ -41,7 +41,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/putoffexecution.ui.class.php';
+include '../lib/ui/putoffexecution.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/execution/test/ui/putoffinlite.php b/module/execution/test/ui/putoffinlite.php
index a3a76470e5..9e277145ac 100644
--- a/module/execution/test/ui/putoffinlite.php
+++ b/module/execution/test/ui/putoffinlite.php
@@ -41,7 +41,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/putoffinlite.ui.class.php';
+include '../lib/ui/putoffinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/startexecution.php b/module/execution/test/ui/startexecution.php
index a555db57c6..4f8aefda50 100644
--- a/module/execution/test/ui/startexecution.php
+++ b/module/execution/test/ui/startexecution.php
@@ -17,7 +17,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/startexecution.ui.class.php';
+include '../lib/ui/startexecution.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/startinlite.php b/module/execution/test/ui/startinlite.php
index ae28e7ad39..d0060cefc8 100644
--- a/module/execution/test/ui/startinlite.php
+++ b/module/execution/test/ui/startinlite.php
@@ -17,7 +17,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/startinlite.ui.class.php';
+include '../lib/ui/startinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/story.php b/module/execution/test/ui/story.php
index ef7ca78e88..463b6c6958 100755
--- a/module/execution/test/ui/story.php
+++ b/module/execution/test/ui/story.php
@@ -49,7 +49,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/story.ui.class.php';
+include '../lib/ui/story.ui.class.php';
 global $config;
 
 $product = zenData('product');
diff --git a/module/execution/test/ui/storyestimate.php b/module/execution/test/ui/storyestimate.php
index bb8473e422..0bf6d492cb 100755
--- a/module/execution/test/ui/storyestimate.php
+++ b/module/execution/test/ui/storyestimate.php
@@ -26,7 +26,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/storyestimate.ui.class.php';
+include '../lib/ui/storyestimate.ui.class.php';
 global $config;
 
 $product = zenData('product');
diff --git a/module/execution/test/ui/storykanban.php b/module/execution/test/ui/storykanban.php
index 61db48ac79..07b2c36de1 100644
--- a/module/execution/test/ui/storykanban.php
+++ b/module/execution/test/ui/storykanban.php
@@ -31,7 +31,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/storykanban.ui.class.php';
+include '../lib/ui/storykanban.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/execution/test/ui/suspendexecution.php b/module/execution/test/ui/suspendexecution.php
index 29c8f8257a..f0b36acbd8 100644
--- a/module/execution/test/ui/suspendexecution.php
+++ b/module/execution/test/ui/suspendexecution.php
@@ -17,7 +17,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/suspendexecution.ui.class.php';
+include '../lib/ui/suspendexecution.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/suspendinlite.php b/module/execution/test/ui/suspendinlite.php
index 0b31892c71..0b24f8d2cf 100644
--- a/module/execution/test/ui/suspendinlite.php
+++ b/module/execution/test/ui/suspendinlite.php
@@ -17,7 +17,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/suspendinlite.ui.class.php';
+include '../lib/ui/suspendinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/execution/test/ui/taskexecution.php b/module/execution/test/ui/taskexecution.php
index 756ca24449..0aed9448f7 100755
--- a/module/execution/test/ui/taskexecution.php
+++ b/module/execution/test/ui/taskexecution.php
@@ -61,7 +61,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/taskexecution.ui.class.php';
+include '../lib/ui/taskexecution.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/execution/test/ui/taskinlite.php b/module/execution/test/ui/taskinlite.php
index 8a947b79e0..8c7fb147c0 100755
--- a/module/execution/test/ui/taskinlite.php
+++ b/module/execution/test/ui/taskinlite.php
@@ -62,7 +62,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/taskinlite.ui.class.php';
+include '../lib/ui/taskinlite.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/execution/test/ui/taskkanban.php b/module/execution/test/ui/taskkanban.php
index fe2a061f79..29ba522278 100755
--- a/module/execution/test/ui/taskkanban.php
+++ b/module/execution/test/ui/taskkanban.php
@@ -19,7 +19,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/taskkanban.ui.class.php';
+include '../lib/ui/taskkanban.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/execution/test/ui/testcase.php b/module/execution/test/ui/testcase.php
index af1438964d..398bebedfe 100755
--- a/module/execution/test/ui/testcase.php
+++ b/module/execution/test/ui/testcase.php
@@ -20,7 +20,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/execution/test/ui/testtask.php b/module/execution/test/ui/testtask.php
index 1a332aee63..c7562b3334 100644
--- a/module/execution/test/ui/testtask.php
+++ b/module/execution/test/ui/testtask.php
@@ -20,7 +20,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/testtask.ui.class.php';
+include '../lib/ui/testtask.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/execution/test/ui/tree.php b/module/execution/test/ui/tree.php
index 2d71a70c87..7bd622d2b3 100644
--- a/module/execution/test/ui/tree.php
+++ b/module/execution/test/ui/tree.php
@@ -37,7 +37,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/tree.ui.class.php';
+include '../lib/ui/tree.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/execution/test/ui/treeinlite.php b/module/execution/test/ui/treeinlite.php
index 135f68688e..99d0eef7ca 100644
--- a/module/execution/test/ui/treeinlite.php
+++ b/module/execution/test/ui/treeinlite.php
@@ -34,7 +34,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/treeinlite.ui.class.php';
+include '../lib/ui/treeinlite.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/execution/test/ui/view.php b/module/execution/test/ui/view.php
index e99f3484e6..3e2323f63e 100644
--- a/module/execution/test/ui/view.php
+++ b/module/execution/test/ui/view.php
@@ -22,7 +22,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/instance/test/lib/instance.ui.class.php b/module/instance/test/lib/ui/instance.ui.class.php
similarity index 97%
rename from module/instance/test/lib/instance.ui.class.php
rename to module/instance/test/lib/ui/instance.ui.class.php
index 8013aeca5b..10f8559f13 100644
--- a/module/instance/test/lib/instance.ui.class.php
+++ b/module/instance/test/lib/ui/instance.ui.class.php
@@ -1,7 +1,7 @@
 <?php
 use Facebook\WebDriver\WebDriverBy;
 
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class instance extends tester
 {
     /**
diff --git a/module/instance/test/ui/instanceview.php b/module/instance/test/ui/instanceview.php
index 2522c5adc0..5b0ff97297 100644
--- a/module/instance/test/ui/instanceview.php
+++ b/module/instance/test/ui/instanceview.php
@@ -1,6 +1,6 @@
 <?php
 chdir(__DIR__);
-include '../lib/instance.ui.class.php';
+include '../lib/ui/instance.ui.class.php';
 $tester = new instance();
 $instance = zenData('pipeline')->loadYaml('pipeline')->gen(7);
 $type = 'GitFox';
diff --git a/module/kanban/test/lib/card.ui.class.php b/module/kanban/test/lib/ui/card.ui.class.php
similarity index 98%
rename from module/kanban/test/lib/card.ui.class.php
rename to module/kanban/test/lib/ui/card.ui.class.php
index 051e20dc90..cc6fae03f0 100755
--- a/module/kanban/test/lib/card.ui.class.php
+++ b/module/kanban/test/lib/ui/card.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class cardTester extends tester
 {
     /*
diff --git a/module/kanban/test/lib/kanban.ui.class.php b/module/kanban/test/lib/ui/kanban.ui.class.php
similarity index 98%
rename from module/kanban/test/lib/kanban.ui.class.php
rename to module/kanban/test/lib/ui/kanban.ui.class.php
index 55a65bcf16..0688811896 100755
--- a/module/kanban/test/lib/kanban.ui.class.php
+++ b/module/kanban/test/lib/ui/kanban.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class kanbanTester extends tester
 {
     /*
diff --git a/module/kanban/test/lib/space.ui.class.php b/module/kanban/test/lib/ui/space.ui.class.php
similarity index 99%
rename from module/kanban/test/lib/space.ui.class.php
rename to module/kanban/test/lib/ui/space.ui.class.php
index a156a88c61..ab6451cf80 100755
--- a/module/kanban/test/lib/space.ui.class.php
+++ b/module/kanban/test/lib/ui/space.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class spaceTester extends tester
 {
     /**
diff --git a/module/kanban/test/lib/view.ui.class.php b/module/kanban/test/lib/ui/view.ui.class.php
similarity index 98%
rename from module/kanban/test/lib/view.ui.class.php
rename to module/kanban/test/lib/ui/view.ui.class.php
index a0d29c9adf..a29441ee58 100755
--- a/module/kanban/test/lib/view.ui.class.php
+++ b/module/kanban/test/lib/ui/view.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewTester extends tester
 {
     /*
diff --git a/module/kanban/test/ui/createcard.php b/module/kanban/test/ui/createcard.php
index f672460d31..3db6273a4a 100755
--- a/module/kanban/test/ui/createcard.php
+++ b/module/kanban/test/ui/createcard.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/card.ui.class.php';
+include '../lib/ui/card.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/createkanban.php b/module/kanban/test/ui/createkanban.php
index b4ca2d5204..f108050396 100755
--- a/module/kanban/test/ui/createkanban.php
+++ b/module/kanban/test/ui/createkanban.php
@@ -6,7 +6,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/kanban.ui.class.php';
+include '../lib/ui/kanban.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/createspace.php b/module/kanban/test/ui/createspace.php
index 9783f5c8ed..a8028468f6 100755
--- a/module/kanban/test/ui/createspace.php
+++ b/module/kanban/test/ui/createspace.php
@@ -6,7 +6,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/space.ui.class.php';
+include '../lib/ui/space.ui.class.php';
 $tester = new spaceTester();
 $tester->login();
 $space = new stdClass();
diff --git a/module/kanban/test/ui/editcard.php b/module/kanban/test/ui/editcard.php
index 5f0e9f0694..9bf304687e 100755
--- a/module/kanban/test/ui/editcard.php
+++ b/module/kanban/test/ui/editcard.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/card.ui.class.php';
+include '../lib/ui/card.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/editkanban.php b/module/kanban/test/ui/editkanban.php
index fc4e25fc4f..da963d70c6 100755
--- a/module/kanban/test/ui/editkanban.php
+++ b/module/kanban/test/ui/editkanban.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/kanban.ui.class.php';
+include '../lib/ui/kanban.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/editlanecolor.php b/module/kanban/test/ui/editlanecolor.php
index 4730dc3c40..faea2bf251 100755
--- a/module/kanban/test/ui/editlanecolor.php
+++ b/module/kanban/test/ui/editlanecolor.php
@@ -13,7 +13,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/editlanename.php b/module/kanban/test/ui/editlanename.php
index 85ccbeb81a..ce20528aee 100755
--- a/module/kanban/test/ui/editlanename.php
+++ b/module/kanban/test/ui/editlanename.php
@@ -16,7 +16,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/editspace.php b/module/kanban/test/ui/editspace.php
index 1665adc0a8..e1ba9ec10c 100755
--- a/module/kanban/test/ui/editspace.php
+++ b/module/kanban/test/ui/editspace.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/space.ui.class.php';
+include '../lib/ui/space.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/managecard.php b/module/kanban/test/ui/managecard.php
index 9277f0d816..37230a3bd8 100755
--- a/module/kanban/test/ui/managecard.php
+++ b/module/kanban/test/ui/managecard.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/card.ui.class.php';
+include '../lib/ui/card.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/managekanban.php b/module/kanban/test/ui/managekanban.php
index 167d99e07f..722548f53b 100755
--- a/module/kanban/test/ui/managekanban.php
+++ b/module/kanban/test/ui/managekanban.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/kanban.ui.class.php';
+include '../lib/ui/kanban.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/managespace.php b/module/kanban/test/ui/managespace.php
index e36ed5a1ee..a91e642215 100755
--- a/module/kanban/test/ui/managespace.php
+++ b/module/kanban/test/ui/managespace.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/space.ui.class.php';
+include '../lib/ui/space.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/setcolumn.php b/module/kanban/test/ui/setcolumn.php
index cdfe78af4b..5121d0794c 100755
--- a/module/kanban/test/ui/setcolumn.php
+++ b/module/kanban/test/ui/setcolumn.php
@@ -14,7 +14,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1');
diff --git a/module/kanban/test/ui/switchspacetab.php b/module/kanban/test/ui/switchspacetab.php
index 484a7f263e..0f1538d4ec 100755
--- a/module/kanban/test/ui/switchspacetab.php
+++ b/module/kanban/test/ui/switchspacetab.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/space.ui.class.php';
+include '../lib/ui/space.ui.class.php';
 
 $kanbanspace = zenData('kanbanspace');
 $kanbanspace->id->range('1-6');
diff --git a/module/my/test/lib/addtodo.ui.class.php b/module/my/test/lib/ui/addtodo.ui.class.php
similarity index 97%
rename from module/my/test/lib/addtodo.ui.class.php
rename to module/my/test/lib/ui/addtodo.ui.class.php
index bd8b12dc0c..2ca52b1fb8 100755
--- a/module/my/test/lib/addtodo.ui.class.php
+++ b/module/my/test/lib/ui/addtodo.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class addTodoTester extends tester
 {
     /**
diff --git a/module/my/test/lib/assignto.ui.class.php b/module/my/test/lib/ui/assignto.ui.class.php
similarity index 96%
rename from module/my/test/lib/assignto.ui.class.php
rename to module/my/test/lib/ui/assignto.ui.class.php
index 50cc5479c6..b32e427e41 100755
--- a/module/my/test/lib/assignto.ui.class.php
+++ b/module/my/test/lib/ui/assignto.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class assignToTester extends tester
 {
     /**
diff --git a/module/my/test/lib/audit.ui.class.php b/module/my/test/lib/ui/audit.ui.class.php
similarity index 97%
rename from module/my/test/lib/audit.ui.class.php
rename to module/my/test/lib/ui/audit.ui.class.php
index a56d3e2e0a..f621be62b4 100755
--- a/module/my/test/lib/audit.ui.class.php
+++ b/module/my/test/lib/ui/audit.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class auditTester extends tester
 {
     /**
diff --git a/module/my/test/lib/checktodotabs.ui.class.php b/module/my/test/lib/ui/checktodotabs.ui.class.php
similarity index 94%
rename from module/my/test/lib/checktodotabs.ui.class.php
rename to module/my/test/lib/ui/checktodotabs.ui.class.php
index d608ea7e05..81341d4367 100755
--- a/module/my/test/lib/checktodotabs.ui.class.php
+++ b/module/my/test/lib/ui/checktodotabs.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class addTodoTester extends tester
 {
     /**
diff --git a/module/my/test/lib/contribute.ui.class.php b/module/my/test/lib/ui/contribute.ui.class.php
similarity index 97%
rename from module/my/test/lib/contribute.ui.class.php
rename to module/my/test/lib/ui/contribute.ui.class.php
index 117fae854c..d0884df7ff 100755
--- a/module/my/test/lib/contribute.ui.class.php
+++ b/module/my/test/lib/ui/contribute.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class contributeTester extends tester
 {
     /**
diff --git a/module/my/test/lib/edittodo.ui.class.php b/module/my/test/lib/ui/edittodo.ui.class.php
similarity index 98%
rename from module/my/test/lib/edittodo.ui.class.php
rename to module/my/test/lib/ui/edittodo.ui.class.php
index fcf3d4577c..996e782929 100755
--- a/module/my/test/lib/edittodo.ui.class.php
+++ b/module/my/test/lib/ui/edittodo.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class addTodoTester extends tester
 {
     /**
diff --git a/module/my/test/lib/viewtodo.ui.class.php b/module/my/test/lib/ui/viewtodo.ui.class.php
similarity index 95%
rename from module/my/test/lib/viewtodo.ui.class.php
rename to module/my/test/lib/ui/viewtodo.ui.class.php
index d0b699dd43..db5c7986e6 100755
--- a/module/my/test/lib/viewtodo.ui.class.php
+++ b/module/my/test/lib/ui/viewtodo.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewTodoTester extends tester
 {
     /**
diff --git a/module/my/test/lib/work.ui.class.php b/module/my/test/lib/ui/work.ui.class.php
similarity index 96%
rename from module/my/test/lib/work.ui.class.php
rename to module/my/test/lib/ui/work.ui.class.php
index e416973603..e4098196f2 100755
--- a/module/my/test/lib/work.ui.class.php
+++ b/module/my/test/lib/ui/work.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class workTester extends tester
 {
     /**
diff --git a/module/my/test/ui/addtodo.php b/module/my/test/ui/addtodo.php
index 659308ec34..65a6299d3c 100755
--- a/module/my/test/ui/addtodo.php
+++ b/module/my/test/ui/addtodo.php
@@ -15,7 +15,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/addtodo.ui.class.php';
+include '../lib/ui/addtodo.ui.class.php';
 
 $todo = zenData('todo');
 $todo->id->range('1-5');
diff --git a/module/my/test/ui/assignto.php b/module/my/test/ui/assignto.php
index 28beb91fc8..cd14404747 100644
--- a/module/my/test/ui/assignto.php
+++ b/module/my/test/ui/assignto.php
@@ -11,7 +11,7 @@ cid=2
 
 */
 chdir(__DIR__);
-include '../lib/assignto.ui.class.php';
+include '../lib/ui/assignto.ui.class.php';
 
 global $config;
 
diff --git a/module/my/test/ui/audit.php b/module/my/test/ui/audit.php
index ba51d057a0..0e66864c69 100755
--- a/module/my/test/ui/audit.php
+++ b/module/my/test/ui/audit.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/audit.ui.class.php';
+include '../lib/ui/audit.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/my/test/ui/checktodotabs.php b/module/my/test/ui/checktodotabs.php
index d406098c3f..cd609df539 100644
--- a/module/my/test/ui/checktodotabs.php
+++ b/module/my/test/ui/checktodotabs.php
@@ -12,7 +12,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/checktodotabs.ui.class.php';
+include '../lib/ui/checktodotabs.ui.class.php';
 
 $todo = zenData('todo');
 $todo->id->range('1-4');
diff --git a/module/my/test/ui/checkworkdata.php b/module/my/test/ui/checkworkdata.php
index 188c5e8e2e..63f14a0c7e 100755
--- a/module/my/test/ui/checkworkdata.php
+++ b/module/my/test/ui/checkworkdata.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/work.ui.class.php';
+include '../lib/ui/work.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/my/test/ui/contribute.php b/module/my/test/ui/contribute.php
index 8e1bde9787..2228470ba9 100755
--- a/module/my/test/ui/contribute.php
+++ b/module/my/test/ui/contribute.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/contribute.ui.class.php';
+include '../lib/ui/contribute.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/my/test/ui/edittodo.php b/module/my/test/ui/edittodo.php
index 57e192681a..254b5ef2a7 100755
--- a/module/my/test/ui/edittodo.php
+++ b/module/my/test/ui/edittodo.php
@@ -24,7 +24,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/edittodo.ui.class.php';
+include '../lib/ui/edittodo.ui.class.php';
 
 $todo = zenData('todo');
 $todo->id->range('1-5');
diff --git a/module/my/test/ui/viewtodo.php b/module/my/test/ui/viewtodo.php
index d11b356eae..3778cf11df 100644
--- a/module/my/test/ui/viewtodo.php
+++ b/module/my/test/ui/viewtodo.php
@@ -13,7 +13,7 @@ cid=2
 
 */
 chdir(__DIR__);
-include '../lib/viewtodo.ui.class.php';
+include '../lib/ui/viewtodo.ui.class.php';
 
 $todo = zendata('todo');
 $todo->id->range('1');
diff --git a/module/product/test/lib/all.ui.class.php b/module/product/test/lib/ui/all.ui.class.php
similarity index 95%
rename from module/product/test/lib/all.ui.class.php
rename to module/product/test/lib/ui/all.ui.class.php
index 2afb3a0a64..d7c8bb26c9 100755
--- a/module/product/test/lib/all.ui.class.php
+++ b/module/product/test/lib/ui/all.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class allTester extends tester
 {
     /**
diff --git a/module/product/test/lib/batcheditproduct.ui.class.php b/module/product/test/lib/ui/batcheditproduct.ui.class.php
similarity index 98%
rename from module/product/test/lib/batcheditproduct.ui.class.php
rename to module/product/test/lib/ui/batcheditproduct.ui.class.php
index fa01d6b90c..1c8e5d8cb3 100644
--- a/module/product/test/lib/batcheditproduct.ui.class.php
+++ b/module/product/test/lib/ui/batcheditproduct.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchEditProduct extends tester
 {
     /**
diff --git a/module/product/test/lib/browse.ui.class.php b/module/product/test/lib/ui/browse.ui.class.php
similarity index 97%
rename from module/product/test/lib/browse.ui.class.php
rename to module/product/test/lib/ui/browse.ui.class.php
index 7199ab7db4..8846302a1e 100755
--- a/module/product/test/lib/browse.ui.class.php
+++ b/module/product/test/lib/ui/browse.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTester extends tester
 {
     /**
diff --git a/module/product/test/lib/changestatus.ui.class.php b/module/product/test/lib/ui/changestatus.ui.class.php
similarity index 98%
rename from module/product/test/lib/changestatus.ui.class.php
rename to module/product/test/lib/ui/changestatus.ui.class.php
index d0521f60a5..10c77cfd1d 100644
--- a/module/product/test/lib/changestatus.ui.class.php
+++ b/module/product/test/lib/ui/changestatus.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 
 class changeStatus extends tester
 {
diff --git a/module/product/test/lib/createproduct.ui.class.php b/module/product/test/lib/ui/createproduct.ui.class.php
similarity index 98%
rename from module/product/test/lib/createproduct.ui.class.php
rename to module/product/test/lib/ui/createproduct.ui.class.php
index 999c4b67bb..57087209c6 100644
--- a/module/product/test/lib/createproduct.ui.class.php
+++ b/module/product/test/lib/ui/createproduct.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProductTester extends tester
 {
     /**
diff --git a/module/product/test/lib/editproduct.ui.class.php b/module/product/test/lib/ui/editproduct.ui.class.php
similarity index 95%
rename from module/product/test/lib/editproduct.ui.class.php
rename to module/product/test/lib/ui/editproduct.ui.class.php
index 60182e37d0..1df22c95b4 100644
--- a/module/product/test/lib/editproduct.ui.class.php
+++ b/module/product/test/lib/ui/editproduct.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editProductTester extends tester
 {
     /**
diff --git a/module/product/test/lib/kanban.ui.class.php b/module/product/test/lib/ui/kanban.ui.class.php
similarity index 95%
rename from module/product/test/lib/kanban.ui.class.php
rename to module/product/test/lib/ui/kanban.ui.class.php
index 9b95993bba..b5c60e246c 100644
--- a/module/product/test/lib/kanban.ui.class.php
+++ b/module/product/test/lib/ui/kanban.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class kanbanTester extends tester
 {
     /**
diff --git a/module/product/test/lib/manageline.ui.class.php b/module/product/test/lib/ui/manageline.ui.class.php
similarity index 97%
rename from module/product/test/lib/manageline.ui.class.php
rename to module/product/test/lib/ui/manageline.ui.class.php
index 3b12cf4826..38014f924e 100644
--- a/module/product/test/lib/manageline.ui.class.php
+++ b/module/product/test/lib/ui/manageline.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class manageLineTester extends tester
 {
     /**
diff --git a/module/product/test/lib/project.ui.class.php b/module/product/test/lib/ui/project.ui.class.php
similarity index 97%
rename from module/product/test/lib/project.ui.class.php
rename to module/product/test/lib/ui/project.ui.class.php
index 1107e90cbc..bc963ca5d0 100644
--- a/module/product/test/lib/project.ui.class.php
+++ b/module/product/test/lib/ui/project.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class projectTester extends tester
 {
     /**
diff --git a/module/product/test/lib/roadmap.ui.class.php b/module/product/test/lib/ui/roadmap.ui.class.php
similarity index 92%
rename from module/product/test/lib/roadmap.ui.class.php
rename to module/product/test/lib/ui/roadmap.ui.class.php
index 959f9026ee..36c64a89de 100644
--- a/module/product/test/lib/roadmap.ui.class.php
+++ b/module/product/test/lib/ui/roadmap.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class roadmapTester extends tester
 {
     /**
diff --git a/module/product/test/lib/track.ui.class.php b/module/product/test/lib/ui/track.ui.class.php
similarity index 96%
rename from module/product/test/lib/track.ui.class.php
rename to module/product/test/lib/ui/track.ui.class.php
index fe2a1b0d4e..98af65aa0c 100644
--- a/module/product/test/lib/track.ui.class.php
+++ b/module/product/test/lib/ui/track.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class trackTester extends tester
 {
     /**
diff --git a/module/product/test/ui/batcheditproduct.php b/module/product/test/ui/batcheditproduct.php
index 7549c9a041..8592d186da 100755
--- a/module/product/test/ui/batcheditproduct.php
+++ b/module/product/test/ui/batcheditproduct.php
@@ -10,7 +10,7 @@ cid=0
 */
 
 chdir(__DIR__);
-include '../lib/batcheditproduct.ui.class.php';
+include '../lib/ui/batcheditproduct.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-5');
diff --git a/module/product/test/ui/changestatus.php b/module/product/test/ui/changestatus.php
index e1d9478856..9c27a03fba 100755
--- a/module/product/test/ui/changestatus.php
+++ b/module/product/test/ui/changestatus.php
@@ -9,7 +9,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/changestatus.ui.class.php';
+include '../lib/ui/changestatus.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/product/test/ui/checkbrowsedata.php b/module/product/test/ui/checkbrowsedata.php
index df5835d629..29b0a45288 100755
--- a/module/product/test/ui/checkbrowsedata.php
+++ b/module/product/test/ui/checkbrowsedata.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/product/test/ui/checkkanbandata.php b/module/product/test/ui/checkkanbandata.php
index 91912a2269..6b75c9ec49 100755
--- a/module/product/test/ui/checkkanbandata.php
+++ b/module/product/test/ui/checkkanbandata.php
@@ -22,7 +22,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/kanban.ui.class.php';
+include '../lib/ui/kanban.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/product/test/ui/checktrack.php b/module/product/test/ui/checktrack.php
index 5398d176a8..dd3cdb8213 100755
--- a/module/product/test/ui/checktrack.php
+++ b/module/product/test/ui/checktrack.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/track.ui.class.php';
+include '../lib/ui/track.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/product/test/ui/createproduct.php b/module/product/test/ui/createproduct.php
index c710c4be7a..dedbab77e6 100755
--- a/module/product/test/ui/createproduct.php
+++ b/module/product/test/ui/createproduct.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/createproduct.ui.class.php';
+include '../lib/ui/createproduct.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 $tester = new createProductTester();
diff --git a/module/product/test/ui/editproduct.php b/module/product/test/ui/editproduct.php
index 021995f0a8..4382d220c9 100755
--- a/module/product/test/ui/editproduct.php
+++ b/module/product/test/ui/editproduct.php
@@ -9,7 +9,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/editproduct.ui.class.php';
+include '../lib/ui/editproduct.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/product/test/ui/export.php b/module/product/test/ui/export.php
index 645642f6c4..524ae5fc49 100755
--- a/module/product/test/ui/export.php
+++ b/module/product/test/ui/export.php
@@ -10,7 +10,7 @@ cid=0
  - 最终测试状态 @SUCCESS
 */
 chdir(__DIR__);
-include '../lib/all.ui.class.php';
+include '../lib/ui/all.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-3');
diff --git a/module/product/test/ui/linkproject.php b/module/product/test/ui/linkproject.php
index 4006460cfe..b7944b50ac 100755
--- a/module/product/test/ui/linkproject.php
+++ b/module/product/test/ui/linkproject.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/project.ui.class.php';
+include '../lib/ui/project.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/product/test/ui/manageline.php b/module/product/test/ui/manageline.php
index 49499da1c4..8e46bf9e9a 100755
--- a/module/product/test/ui/manageline.php
+++ b/module/product/test/ui/manageline.php
@@ -9,7 +9,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/manageline.ui.class.php';
+include '../lib/ui/manageline.ui.class.php';
 
 $tester = new manageLineTester();
 $tester->login();
diff --git a/module/product/test/ui/projectlist.php b/module/product/test/ui/projectlist.php
index f6dcee60db..01fec1ea92 100755
--- a/module/product/test/ui/projectlist.php
+++ b/module/product/test/ui/projectlist.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/project.ui.class.php';
+include '../lib/ui/project.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/product/test/ui/roadmap.php b/module/product/test/ui/roadmap.php
index 1c44e15070..19a0f1786a 100755
--- a/module/product/test/ui/roadmap.php
+++ b/module/product/test/ui/roadmap.php
@@ -9,7 +9,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/roadmap.ui.class.php';
+include '../lib/ui/roadmap.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/product/test/ui/switchtab.php b/module/product/test/ui/switchtab.php
index e670263990..f382762c79 100755
--- a/module/product/test/ui/switchtab.php
+++ b/module/product/test/ui/switchtab.php
@@ -9,7 +9,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/all.ui.class.php';
+include '../lib/ui/all.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-3');
diff --git a/module/productplan/test/lib/batchchangestatus.ui.class.php b/module/productplan/test/lib/ui/batchchangestatus.ui.class.php
similarity index 97%
rename from module/productplan/test/lib/batchchangestatus.ui.class.php
rename to module/productplan/test/lib/ui/batchchangestatus.ui.class.php
index 8c389ef6ee..38b7f04cd0 100644
--- a/module/productplan/test/lib/batchchangestatus.ui.class.php
+++ b/module/productplan/test/lib/ui/batchchangestatus.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchChangeStatusTester extends tester
 {
     /**
diff --git a/module/productplan/test/lib/batcheditplan.ui.class.php b/module/productplan/test/lib/ui/batcheditplan.ui.class.php
similarity index 98%
rename from module/productplan/test/lib/batcheditplan.ui.class.php
rename to module/productplan/test/lib/ui/batcheditplan.ui.class.php
index cf04562ea4..9ecc1618db 100644
--- a/module/productplan/test/lib/batcheditplan.ui.class.php
+++ b/module/productplan/test/lib/ui/batcheditplan.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchEditPlanTester extends tester
 {
     /**
diff --git a/module/productplan/test/lib/browse.ui.class.php b/module/productplan/test/lib/ui/browse.ui.class.php
similarity index 98%
rename from module/productplan/test/lib/browse.ui.class.php
rename to module/productplan/test/lib/ui/browse.ui.class.php
index 58a4c5c129..53806290f4 100644
--- a/module/productplan/test/lib/browse.ui.class.php
+++ b/module/productplan/test/lib/ui/browse.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTester extends tester
 {
     /**
diff --git a/module/productplan/test/lib/changeplanstatus.ui.class.php b/module/productplan/test/lib/ui/changeplanstatus.ui.class.php
similarity index 98%
rename from module/productplan/test/lib/changeplanstatus.ui.class.php
rename to module/productplan/test/lib/ui/changeplanstatus.ui.class.php
index 92ce63eaf0..ab29cf2680 100644
--- a/module/productplan/test/lib/changeplanstatus.ui.class.php
+++ b/module/productplan/test/lib/ui/changeplanstatus.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 
 class changePlanStatus extends tester
 {
diff --git a/module/productplan/test/lib/createplan.ui.class.php b/module/productplan/test/lib/ui/createplan.ui.class.php
similarity index 98%
rename from module/productplan/test/lib/createplan.ui.class.php
rename to module/productplan/test/lib/ui/createplan.ui.class.php
index c81e90a4a7..0d5eeb2780 100755
--- a/module/productplan/test/lib/createplan.ui.class.php
+++ b/module/productplan/test/lib/ui/createplan.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createPlanTester extends tester
 {
     /**
diff --git a/module/productplan/test/lib/editplan.ui.class.php b/module/productplan/test/lib/ui/editplan.ui.class.php
similarity index 98%
rename from module/productplan/test/lib/editplan.ui.class.php
rename to module/productplan/test/lib/ui/editplan.ui.class.php
index 16b7418b9f..43e22db1a5 100755
--- a/module/productplan/test/lib/editplan.ui.class.php
+++ b/module/productplan/test/lib/ui/editplan.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editPlanTester extends tester
 {
     /**
diff --git a/module/productplan/test/lib/linkbug.ui.class.php b/module/productplan/test/lib/ui/linkbug.ui.class.php
similarity index 98%
rename from module/productplan/test/lib/linkbug.ui.class.php
rename to module/productplan/test/lib/ui/linkbug.ui.class.php
index 24070d9a13..b8008272ee 100644
--- a/module/productplan/test/lib/linkbug.ui.class.php
+++ b/module/productplan/test/lib/ui/linkbug.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class linkBugTester extends tester
 {
     /**
diff --git a/module/productplan/test/lib/linkstory.ui.class.php b/module/productplan/test/lib/ui/linkstory.ui.class.php
similarity index 97%
rename from module/productplan/test/lib/linkstory.ui.class.php
rename to module/productplan/test/lib/ui/linkstory.ui.class.php
index e50c32177d..5b5705baff 100644
--- a/module/productplan/test/lib/linkstory.ui.class.php
+++ b/module/productplan/test/lib/ui/linkstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class linkStoryTester extends tester
 {
     /**
diff --git a/module/productplan/test/ui/batchchangestatus.php b/module/productplan/test/ui/batchchangestatus.php
index 5ee9bf94d3..9120c7ec92 100755
--- a/module/productplan/test/ui/batchchangestatus.php
+++ b/module/productplan/test/ui/batchchangestatus.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/batchchangestatus.ui.class.php';
+include '../lib/ui/batchchangestatus.ui.class.php';
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 zendata('productplan')->loadYaml('productplan', false, 2)->gen(10);
 $tester = new batchChangeStatusTester();
diff --git a/module/productplan/test/ui/batchcloseplan.php b/module/productplan/test/ui/batchcloseplan.php
index 7d2c3d21f0..0f26979442 100755
--- a/module/productplan/test/ui/batchcloseplan.php
+++ b/module/productplan/test/ui/batchcloseplan.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/batchchangestatus.ui.class.php';
+include '../lib/ui/batchchangestatus.ui.class.php';
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 zendata('productplan')->loadYaml('productplan', false, 2)->gen(10);
 $tester = new batchChangeStatusTester();
diff --git a/module/productplan/test/ui/batcheditplan.php b/module/productplan/test/ui/batcheditplan.php
index cd9791b0db..381dbd45e0 100755
--- a/module/productplan/test/ui/batcheditplan.php
+++ b/module/productplan/test/ui/batcheditplan.php
@@ -6,7 +6,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/batcheditplan.ui.class.php';
+include '../lib/ui/batcheditplan.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 zendata('productplan')->loadYaml('productplan', false, 2)->gen(10);
diff --git a/module/productplan/test/ui/changeplanstatus.php b/module/productplan/test/ui/changeplanstatus.php
index 44270373a2..7cc7809633 100755
--- a/module/productplan/test/ui/changeplanstatus.php
+++ b/module/productplan/test/ui/changeplanstatus.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/changeplanstatus.ui.class.php';
+include '../lib/ui/changeplanstatus.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 zendata('productplan')->loadYaml('productplan', false, 2)->gen(10);
diff --git a/module/productplan/test/ui/createproductplan.php b/module/productplan/test/ui/createproductplan.php
index 2fb3f005a9..1f0d5c73f6 100755
--- a/module/productplan/test/ui/createproductplan.php
+++ b/module/productplan/test/ui/createproductplan.php
@@ -8,7 +8,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/createplan.ui.class.php';
+include '../lib/ui/createplan.ui.class.php';
 $product = zenData('product');
 $product->id->range('1');
 $product->name->range('产品01');
diff --git a/module/productplan/test/ui/editproductplan.php b/module/productplan/test/ui/editproductplan.php
index cde3b6e8fd..d97be12727 100755
--- a/module/productplan/test/ui/editproductplan.php
+++ b/module/productplan/test/ui/editproductplan.php
@@ -7,7 +7,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/editplan.ui.class.php';
+include '../lib/ui/editplan.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 zendata('productplan')->loadYaml('productplan', false, 2)->gen(10);
diff --git a/module/productplan/test/ui/linkbug.php b/module/productplan/test/ui/linkbug.php
index 26cb1aac47..9e2e9d040a 100755
--- a/module/productplan/test/ui/linkbug.php
+++ b/module/productplan/test/ui/linkbug.php
@@ -7,7 +7,7 @@ timeout=0
 cid=0
 */
 chdir(__DIR__);
-include '../lib/linkbug.ui.class.php';
+include '../lib/ui/linkbug.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 zendata('productplan')->loadYaml('productplan', false, 2)->gen(10);
diff --git a/module/productplan/test/ui/linkstory.php b/module/productplan/test/ui/linkstory.php
index 15c912cbeb..f71d08f38c 100755
--- a/module/productplan/test/ui/linkstory.php
+++ b/module/productplan/test/ui/linkstory.php
@@ -9,7 +9,7 @@ cid=0
 */
 
 chdir(__DIR__);
-include '../lib/linkstory.ui.class.php';
+include '../lib/ui/linkstory.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 zendata('productplan')->loadYaml('productplan', false, 2)->gen(10);
diff --git a/module/productplan/test/ui/sortinkanban.php b/module/productplan/test/ui/sortinkanban.php
index 7183a85de0..5b225219a0 100755
--- a/module/productplan/test/ui/sortinkanban.php
+++ b/module/productplan/test/ui/sortinkanban.php
@@ -9,7 +9,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 $productplan = zenData('productplan');
diff --git a/module/productplan/test/ui/switchbrowsetype.php b/module/productplan/test/ui/switchbrowsetype.php
index c6bf6d42bc..cc651d8fd6 100755
--- a/module/productplan/test/ui/switchbrowsetype.php
+++ b/module/productplan/test/ui/switchbrowsetype.php
@@ -10,7 +10,7 @@ cid=0
 */
 
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 zendata('productplan')->loadYaml('productplan', false, 2)->gen(10);
diff --git a/module/productplan/test/ui/switchplantab.php b/module/productplan/test/ui/switchplantab.php
index 67b053cdca..108cc1f27d 100755
--- a/module/productplan/test/ui/switchplantab.php
+++ b/module/productplan/test/ui/switchplantab.php
@@ -9,7 +9,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 zendata('product')->loadYaml('product', false, 2)->gen(10);
 $productplan = zenData('productplan');
diff --git a/module/program/test/lib/activateprogram.ui.class.php b/module/program/test/lib/ui/activateprogram.ui.class.php
similarity index 93%
rename from module/program/test/lib/activateprogram.ui.class.php
rename to module/program/test/lib/ui/activateprogram.ui.class.php
index dc10108e48..37cc9da941 100755
--- a/module/program/test/lib/activateprogram.ui.class.php
+++ b/module/program/test/lib/ui/activateprogram.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProgramTester extends tester
 {
     /**
diff --git a/module/program/test/lib/closeprogram.ui.class.php b/module/program/test/lib/ui/closeprogram.ui.class.php
similarity index 93%
rename from module/program/test/lib/closeprogram.ui.class.php
rename to module/program/test/lib/ui/closeprogram.ui.class.php
index c926fee910..2c24b1a752 100755
--- a/module/program/test/lib/closeprogram.ui.class.php
+++ b/module/program/test/lib/ui/closeprogram.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProgramTester extends tester
 {
     /**
diff --git a/module/program/test/lib/createprogram.ui.class.php b/module/program/test/lib/ui/createprogram.ui.class.php
similarity index 98%
rename from module/program/test/lib/createprogram.ui.class.php
rename to module/program/test/lib/ui/createprogram.ui.class.php
index 5f482891b4..baa429e563 100755
--- a/module/program/test/lib/createprogram.ui.class.php
+++ b/module/program/test/lib/ui/createprogram.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProgramTester extends tester
 {
     /**
diff --git a/module/program/test/lib/createstakeholder.ui.class.php b/module/program/test/lib/ui/createstakeholder.ui.class.php
similarity index 97%
rename from module/program/test/lib/createstakeholder.ui.class.php
rename to module/program/test/lib/ui/createstakeholder.ui.class.php
index 75e38b8a9d..65f08fffdc 100644
--- a/module/program/test/lib/createstakeholder.ui.class.php
+++ b/module/program/test/lib/ui/createstakeholder.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createStakeholderTester extends tester
 {
     /**
diff --git a/module/program/test/lib/deleteprogram.ui.class.php b/module/program/test/lib/ui/deleteprogram.ui.class.php
similarity index 93%
rename from module/program/test/lib/deleteprogram.ui.class.php
rename to module/program/test/lib/ui/deleteprogram.ui.class.php
index 27047737c1..2a16455cf8 100755
--- a/module/program/test/lib/deleteprogram.ui.class.php
+++ b/module/program/test/lib/ui/deleteprogram.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProgramTester extends tester
 {
     /**
diff --git a/module/program/test/lib/editprogram.ui.class.php b/module/program/test/lib/ui/editprogram.ui.class.php
similarity index 94%
rename from module/program/test/lib/editprogram.ui.class.php
rename to module/program/test/lib/ui/editprogram.ui.class.php
index b4af99b591..86a5bcdbb3 100755
--- a/module/program/test/lib/editprogram.ui.class.php
+++ b/module/program/test/lib/ui/editprogram.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProgramTester extends tester
 {
     /**
diff --git a/module/program/test/lib/productview.ui.class.php b/module/program/test/lib/ui/productview.ui.class.php
similarity index 98%
rename from module/program/test/lib/productview.ui.class.php
rename to module/program/test/lib/ui/productview.ui.class.php
index 7ffe44db88..30f084539e 100755
--- a/module/program/test/lib/productview.ui.class.php
+++ b/module/program/test/lib/ui/productview.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProgramTester extends tester
 {
     /**
diff --git a/module/program/test/lib/projectview.ui.class.php b/module/program/test/lib/ui/projectview.ui.class.php
similarity index 96%
rename from module/program/test/lib/projectview.ui.class.php
rename to module/program/test/lib/ui/projectview.ui.class.php
index 775dd15f9c..1daa7f7506 100755
--- a/module/program/test/lib/projectview.ui.class.php
+++ b/module/program/test/lib/ui/projectview.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProgramTester extends tester
 {
     /**
diff --git a/module/program/test/lib/startprogram.ui.class.php b/module/program/test/lib/ui/startprogram.ui.class.php
similarity index 93%
rename from module/program/test/lib/startprogram.ui.class.php
rename to module/program/test/lib/ui/startprogram.ui.class.php
index fd484c4e10..e78956b326 100755
--- a/module/program/test/lib/startprogram.ui.class.php
+++ b/module/program/test/lib/ui/startprogram.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProgramTester extends tester
 {
     /**
diff --git a/module/program/test/lib/unlinkstakeholder.ui.class.php b/module/program/test/lib/ui/unlinkstakeholder.ui.class.php
similarity index 96%
rename from module/program/test/lib/unlinkstakeholder.ui.class.php
rename to module/program/test/lib/ui/unlinkstakeholder.ui.class.php
index 99ddfd5d2a..beb27abe6b 100644
--- a/module/program/test/lib/unlinkstakeholder.ui.class.php
+++ b/module/program/test/lib/ui/unlinkstakeholder.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class unlinkStakeholderTester extends tester
 {
     /**
diff --git a/module/program/test/ui/activateprogram.php b/module/program/test/ui/activateprogram.php
index 17ddc282ff..deffbb8568 100755
--- a/module/program/test/ui/activateprogram.php
+++ b/module/program/test/ui/activateprogram.php
@@ -14,7 +14,7 @@ cid=0
  */
 
 chdir(__DIR__);
-include '../lib/activateprogram.ui.class.php';
+include '../lib/ui/activateprogram.ui.class.php';
 
 $program = zenData('project');
 $program->id->range('1-2');
diff --git a/module/program/test/ui/closeprogram.php b/module/program/test/ui/closeprogram.php
index bbbc7e1b7f..23c1c39d37 100755
--- a/module/program/test/ui/closeprogram.php
+++ b/module/program/test/ui/closeprogram.php
@@ -14,7 +14,7 @@ cid=0
  */
 
 chdir(__DIR__);
-include '../lib/closeprogram.ui.class.php';
+include '../lib/ui/closeprogram.ui.class.php';
 
 $program = zenData('project');
 $program->id->range('1-2');
diff --git a/module/program/test/ui/createprogram.php b/module/program/test/ui/createprogram.php
index a290623baa..76c1f26047 100755
--- a/module/program/test/ui/createprogram.php
+++ b/module/program/test/ui/createprogram.php
@@ -24,7 +24,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/createprogram.ui.class.php';
+include '../lib/ui/createprogram.ui.class.php';
 
 zendata('project')->loadYaml('program', false, 2)->gen(10);
 $tester = new createProgramTester();
diff --git a/module/program/test/ui/createstakeholder.php b/module/program/test/ui/createstakeholder.php
index 41fdf05187..ae0bd14675 100755
--- a/module/program/test/ui/createstakeholder.php
+++ b/module/program/test/ui/createstakeholder.php
@@ -26,7 +26,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/createstakeholder.ui.class.php';
+include '../lib/ui/createstakeholder.ui.class.php';
 global $config;
 
 $stakeholder = zenData('stakeholder');
diff --git a/module/program/test/ui/deleteprogram.php b/module/program/test/ui/deleteprogram.php
index aac80e6355..2c809e943b 100755
--- a/module/program/test/ui/deleteprogram.php
+++ b/module/program/test/ui/deleteprogram.php
@@ -14,7 +14,7 @@ cid=0
  */
 
 chdir(__DIR__);
-include '../lib/deleteprogram.ui.class.php';
+include '../lib/ui/deleteprogram.ui.class.php';
 
 $program = zenData('project');
 $program->id->range('1-2');
diff --git a/module/program/test/ui/editprogram.php b/module/program/test/ui/editprogram.php
index e5b1158e17..d71733c96e 100755
--- a/module/program/test/ui/editprogram.php
+++ b/module/program/test/ui/editprogram.php
@@ -12,7 +12,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/editprogram.ui.class.php';
+include '../lib/ui/editprogram.ui.class.php';
 
 $program = zenData('project');
 $program->id->range('1-2');
diff --git a/module/program/test/ui/productview.php b/module/program/test/ui/productview.php
index b6b893c723..6ec1b6007e 100755
--- a/module/program/test/ui/productview.php
+++ b/module/program/test/ui/productview.php
@@ -10,7 +10,7 @@ timeout=0
  - 最终测试状态 @SUCCESS
 */
 chdir(__DIR__);
-include '../lib/productview.ui.class.php';
+include '../lib/ui/productview.ui.class.php';
 
 $tester = new createProgramTester();
 $tester->login();
diff --git a/module/program/test/ui/projectview.php b/module/program/test/ui/projectview.php
index 9f952e2295..b530b5bcc6 100755
--- a/module/program/test/ui/projectview.php
+++ b/module/program/test/ui/projectview.php
@@ -10,7 +10,7 @@ timeout=0
  - 最终测试状态 @SUCCESS
 */
 chdir(__DIR__);
-include '../lib/projectview.ui.class.php';
+include '../lib/ui/projectview.ui.class.php';
 
 zendata('project')->loadYaml('program', false, 2)->gen(10);
 $tester = new createProgramTester();
diff --git a/module/program/test/ui/startprogram.php b/module/program/test/ui/startprogram.php
index ea2601f4de..3d1967c5f8 100755
--- a/module/program/test/ui/startprogram.php
+++ b/module/program/test/ui/startprogram.php
@@ -13,7 +13,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/startprogram.ui.class.php';
+include '../lib/ui/startprogram.ui.class.php';
 
 $program = zenData('project');
 $program->id->range('1-2');
diff --git a/module/program/test/ui/unlinkstakeholder.php b/module/program/test/ui/unlinkstakeholder.php
index c66c0cb838..81a1f7dc34 100755
--- a/module/program/test/ui/unlinkstakeholder.php
+++ b/module/program/test/ui/unlinkstakeholder.php
@@ -16,7 +16,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/unlinkstakeholder.ui.class.php';
+include '../lib/ui/unlinkstakeholder.ui.class.php';
 global $config;
 
 $stakeholder = zenData('stakeholder');
diff --git a/module/programplan/test/lib/createstage.ui.class.php b/module/programplan/test/lib/ui/createstage.ui.class.php
similarity index 98%
rename from module/programplan/test/lib/createstage.ui.class.php
rename to module/programplan/test/lib/ui/createstage.ui.class.php
index bd0228c866..f9a726fac1 100755
--- a/module/programplan/test/lib/createstage.ui.class.php
+++ b/module/programplan/test/lib/ui/createstage.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createStageTester extends tester
 {
     /**
diff --git a/module/programplan/test/lib/createsubstage.ui.class.php b/module/programplan/test/lib/ui/createsubstage.ui.class.php
similarity index 98%
rename from module/programplan/test/lib/createsubstage.ui.class.php
rename to module/programplan/test/lib/ui/createsubstage.ui.class.php
index e2b69f85c1..c7b517d8b5 100755
--- a/module/programplan/test/lib/createsubstage.ui.class.php
+++ b/module/programplan/test/lib/ui/createsubstage.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createSubStageTester extends tester
 {
     /**
diff --git a/module/programplan/test/lib/editstage.ui.class.php b/module/programplan/test/lib/ui/editstage.ui.class.php
similarity index 98%
rename from module/programplan/test/lib/editstage.ui.class.php
rename to module/programplan/test/lib/ui/editstage.ui.class.php
index a3e4a7572b..e9d01e600b 100755
--- a/module/programplan/test/lib/editstage.ui.class.php
+++ b/module/programplan/test/lib/ui/editstage.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editStageTester extends tester
 {
     /**
diff --git a/module/programplan/test/ui/createstage.php b/module/programplan/test/ui/createstage.php
index ccfde54b6b..9303093b53 100755
--- a/module/programplan/test/ui/createstage.php
+++ b/module/programplan/test/ui/createstage.php
@@ -23,7 +23,7 @@ cid=1
 
 */
 chdir(__DIR__);
-include '../lib/createstage.ui.class.php';
+include '../lib/ui/createstage.ui.class.php';
 
 $stage = zendata('stage');
 $stage->id->range('1-12');
diff --git a/module/programplan/test/ui/createsubstage.php b/module/programplan/test/ui/createsubstage.php
index 176fa99f36..81ef7f2445 100755
--- a/module/programplan/test/ui/createsubstage.php
+++ b/module/programplan/test/ui/createsubstage.php
@@ -22,7 +22,7 @@ cid=2
 - 创建需求子阶段最终测试状态 @SUCCESS
 */
 chdir(__DIR__);
-include '../lib/createsubstage.ui.class.php';
+include '../lib/ui/createsubstage.ui.class.php';
 
 zendata('project')->loadYaml('execution', false, 1)->gen(10);
 zendata('projectspec')->gen(0);
diff --git a/module/programplan/test/ui/editstage.php b/module/programplan/test/ui/editstage.php
index 7125b57ffd..54f312c30e 100755
--- a/module/programplan/test/ui/editstage.php
+++ b/module/programplan/test/ui/editstage.php
@@ -20,7 +20,7 @@ cid=3
 
 */
 chdir(__DIR__);
-include '../lib/editstage.ui.class.php';
+include '../lib/ui/editstage.ui.class.php';
 
 zendata('project')->loadYaml('execution', false, 2)->gen(10);
 zendata('projectspec')->gen(0);
diff --git a/module/project/test/lib/activeproject.ui.class.php b/module/project/test/lib/ui/activeproject.ui.class.php
similarity index 96%
rename from module/project/test/lib/activeproject.ui.class.php
rename to module/project/test/lib/ui/activeproject.ui.class.php
index 0bc154d29d..ca49741057 100644
--- a/module/project/test/lib/activeproject.ui.class.php
+++ b/module/project/test/lib/ui/activeproject.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class activeprojectTester extends tester
 {
  /**
diff --git a/module/project/test/lib/activeprojectlite.ui.class.php b/module/project/test/lib/ui/activeprojectlite.ui.class.php
similarity index 96%
rename from module/project/test/lib/activeprojectlite.ui.class.php
rename to module/project/test/lib/ui/activeprojectlite.ui.class.php
index a0cd21ce7e..0a84ba5a29 100644
--- a/module/project/test/lib/activeprojectlite.ui.class.php
+++ b/module/project/test/lib/ui/activeprojectlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class activeprojectliteTester extends tester
 {
  /**
diff --git a/module/project/test/lib/batcheditproject.ui.class.php b/module/project/test/lib/ui/batcheditproject.ui.class.php
similarity index 98%
rename from module/project/test/lib/batcheditproject.ui.class.php
rename to module/project/test/lib/ui/batcheditproject.ui.class.php
index 5b7fab23aa..d4d1023fbc 100644
--- a/module/project/test/lib/batcheditproject.ui.class.php
+++ b/module/project/test/lib/ui/batcheditproject.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchEditProjectTester extends tester
 {
     /**
diff --git a/module/project/test/lib/batcheditprojectlite.ui.class.php b/module/project/test/lib/ui/batcheditprojectlite.ui.class.php
similarity index 98%
rename from module/project/test/lib/batcheditprojectlite.ui.class.php
rename to module/project/test/lib/ui/batcheditprojectlite.ui.class.php
index e21c856a0f..734dbe8bef 100755
--- a/module/project/test/lib/batcheditprojectlite.ui.class.php
+++ b/module/project/test/lib/ui/batcheditprojectlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchEditProjectLiteTester extends tester
 {
     /**
diff --git a/module/project/test/lib/browsetab.ui.class.php b/module/project/test/lib/ui/browsetab.ui.class.php
similarity index 96%
rename from module/project/test/lib/browsetab.ui.class.php
rename to module/project/test/lib/ui/browsetab.ui.class.php
index 8b57b29c24..f5c8f3c5d1 100644
--- a/module/project/test/lib/browsetab.ui.class.php
+++ b/module/project/test/lib/ui/browsetab.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTabTester extends tester
 {
     /**
diff --git a/module/project/test/lib/browsetablite.ui.class.php b/module/project/test/lib/ui/browsetablite.ui.class.php
similarity index 96%
rename from module/project/test/lib/browsetablite.ui.class.php
rename to module/project/test/lib/ui/browsetablite.ui.class.php
index 6d4ad17d9f..fa43b0e50d 100755
--- a/module/project/test/lib/browsetablite.ui.class.php
+++ b/module/project/test/lib/ui/browsetablite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTabLiteTester extends tester
 {
     /**
diff --git a/module/project/test/lib/bug.ui.class.php b/module/project/test/lib/ui/bug.ui.class.php
similarity index 99%
rename from module/project/test/lib/bug.ui.class.php
rename to module/project/test/lib/ui/bug.ui.class.php
index 4e27aac080..4f43a6ae81 100644
--- a/module/project/test/lib/bug.ui.class.php
+++ b/module/project/test/lib/ui/bug.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class bugTester extends tester
 {
     /**
diff --git a/module/project/test/lib/closeproject.ui.class.php b/module/project/test/lib/ui/closeproject.ui.class.php
similarity index 95%
rename from module/project/test/lib/closeproject.ui.class.php
rename to module/project/test/lib/ui/closeproject.ui.class.php
index 2adfd4b527..ab6adb7520 100644
--- a/module/project/test/lib/closeproject.ui.class.php
+++ b/module/project/test/lib/ui/closeproject.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class closeprojectTester extends tester
 {
  /**
diff --git a/module/project/test/lib/closeprojectlite.ui.class.php b/module/project/test/lib/ui/closeprojectlite.ui.class.php
similarity index 96%
rename from module/project/test/lib/closeprojectlite.ui.class.php
rename to module/project/test/lib/ui/closeprojectlite.ui.class.php
index 1441168495..c473fdccb1 100755
--- a/module/project/test/lib/closeprojectlite.ui.class.php
+++ b/module/project/test/lib/ui/closeprojectlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class closeprojectliteTester extends tester
 {
  /**
diff --git a/module/project/test/lib/createguide.ui.class.php b/module/project/test/lib/ui/createguide.ui.class.php
similarity index 92%
rename from module/project/test/lib/createguide.ui.class.php
rename to module/project/test/lib/ui/createguide.ui.class.php
index 74bc33b459..0985c4a07e 100644
--- a/module/project/test/lib/createguide.ui.class.php
+++ b/module/project/test/lib/ui/createguide.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createGuideTester extends tester
 {
     /**
diff --git a/module/project/test/lib/createkanban.ui.class.php b/module/project/test/lib/ui/createkanban.ui.class.php
similarity index 98%
rename from module/project/test/lib/createkanban.ui.class.php
rename to module/project/test/lib/ui/createkanban.ui.class.php
index b78ee07f88..3cad2bef44 100644
--- a/module/project/test/lib/createkanban.ui.class.php
+++ b/module/project/test/lib/ui/createkanban.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createKanbanTester extends tester
 {
     /**
diff --git a/module/project/test/lib/createprojectlite.ui.class.php b/module/project/test/lib/ui/createprojectlite.ui.class.php
similarity index 98%
rename from module/project/test/lib/createprojectlite.ui.class.php
rename to module/project/test/lib/ui/createprojectlite.ui.class.php
index 235fcac648..2191b9bffc 100644
--- a/module/project/test/lib/createprojectlite.ui.class.php
+++ b/module/project/test/lib/ui/createprojectlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProjectLiteTester extends tester
 {
     /**
diff --git a/module/project/test/lib/createscrum.ui.class.php b/module/project/test/lib/ui/createscrum.ui.class.php
similarity index 98%
rename from module/project/test/lib/createscrum.ui.class.php
rename to module/project/test/lib/ui/createscrum.ui.class.php
index c1e8693554..9579192484 100644
--- a/module/project/test/lib/createscrum.ui.class.php
+++ b/module/project/test/lib/ui/createscrum.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createScrumTester extends tester
 {
     /**
diff --git a/module/project/test/lib/createsprint.ui.class.php b/module/project/test/lib/ui/createsprint.ui.class.php
similarity index 98%
rename from module/project/test/lib/createsprint.ui.class.php
rename to module/project/test/lib/ui/createsprint.ui.class.php
index b887c8a83b..777c58b614 100644
--- a/module/project/test/lib/createsprint.ui.class.php
+++ b/module/project/test/lib/ui/createsprint.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createSprintTester extends tester
 {
     /**
diff --git a/module/project/test/lib/createwaterfall.ui.class.php b/module/project/test/lib/ui/createwaterfall.ui.class.php
similarity index 98%
rename from module/project/test/lib/createwaterfall.ui.class.php
rename to module/project/test/lib/ui/createwaterfall.ui.class.php
index b171a72174..6dbf36ca25 100755
--- a/module/project/test/lib/createwaterfall.ui.class.php
+++ b/module/project/test/lib/ui/createwaterfall.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createWaterfallTester extends tester
 {
     /**
diff --git a/module/project/test/lib/createwaterfallplus.ui.class.php b/module/project/test/lib/ui/createwaterfallplus.ui.class.php
similarity index 98%
rename from module/project/test/lib/createwaterfallplus.ui.class.php
rename to module/project/test/lib/ui/createwaterfallplus.ui.class.php
index 1b5727416c..fe33886c70 100644
--- a/module/project/test/lib/createwaterfallplus.ui.class.php
+++ b/module/project/test/lib/ui/createwaterfallplus.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createWaterfallplusTester extends tester
 {
     /**
diff --git a/module/project/test/lib/editproject.ui.class.php b/module/project/test/lib/ui/editproject.ui.class.php
similarity index 95%
rename from module/project/test/lib/editproject.ui.class.php
rename to module/project/test/lib/ui/editproject.ui.class.php
index f667b1de98..2390f3aa6b 100644
--- a/module/project/test/lib/editproject.ui.class.php
+++ b/module/project/test/lib/ui/editproject.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editProjectTester extends tester
 {
  /**
diff --git a/module/project/test/lib/editprojectlite.ui.class.php b/module/project/test/lib/ui/editprojectlite.ui.class.php
similarity index 98%
rename from module/project/test/lib/editprojectlite.ui.class.php
rename to module/project/test/lib/ui/editprojectlite.ui.class.php
index 053c988046..114750df69 100644
--- a/module/project/test/lib/editprojectlite.ui.class.php
+++ b/module/project/test/lib/ui/editprojectlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editProjectLiteTester extends tester
 {
     /**
diff --git a/module/project/test/lib/execution.ui.class.php b/module/project/test/lib/ui/execution.ui.class.php
similarity index 95%
rename from module/project/test/lib/execution.ui.class.php
rename to module/project/test/lib/ui/execution.ui.class.php
index 5d5d984bcb..a043090d27 100644
--- a/module/project/test/lib/execution.ui.class.php
+++ b/module/project/test/lib/ui/execution.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class executionTester extends tester
 {
     /**
diff --git a/module/project/test/lib/executionforlite.ui.class.php b/module/project/test/lib/ui/executionforlite.ui.class.php
similarity index 96%
rename from module/project/test/lib/executionforlite.ui.class.php
rename to module/project/test/lib/ui/executionforlite.ui.class.php
index ef685dde9d..e98cac30dd 100644
--- a/module/project/test/lib/executionforlite.ui.class.php
+++ b/module/project/test/lib/ui/executionforlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class executionForLiteTester extends tester
 {
     /**
diff --git a/module/project/test/lib/group.ui.class.php b/module/project/test/lib/ui/group.ui.class.php
similarity index 97%
rename from module/project/test/lib/group.ui.class.php
rename to module/project/test/lib/ui/group.ui.class.php
index 0662b2a9c5..73f1a814b2 100644
--- a/module/project/test/lib/group.ui.class.php
+++ b/module/project/test/lib/ui/group.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class groupTester extends tester
 {
     /**
diff --git a/module/project/test/lib/managemembers.ui.class.php b/module/project/test/lib/ui/managemembers.ui.class.php
similarity index 98%
rename from module/project/test/lib/managemembers.ui.class.php
rename to module/project/test/lib/ui/managemembers.ui.class.php
index 2ef95365be..db662bffd1 100644
--- a/module/project/test/lib/managemembers.ui.class.php
+++ b/module/project/test/lib/ui/managemembers.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class manageMembersTester extends tester
 {
     /**
diff --git a/module/project/test/lib/managemembersforlite.ui.class.php b/module/project/test/lib/ui/managemembersforlite.ui.class.php
similarity index 98%
rename from module/project/test/lib/managemembersforlite.ui.class.php
rename to module/project/test/lib/ui/managemembersforlite.ui.class.php
index 562bc54df7..e6c11e00e1 100644
--- a/module/project/test/lib/managemembersforlite.ui.class.php
+++ b/module/project/test/lib/ui/managemembersforlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class manageMembersForLiteTester extends tester
 {
     /**
diff --git a/module/project/test/lib/manageproducts.ui.class.php b/module/project/test/lib/ui/manageproducts.ui.class.php
similarity index 97%
rename from module/project/test/lib/manageproducts.ui.class.php
rename to module/project/test/lib/ui/manageproducts.ui.class.php
index e1963272b8..29dfd3450b 100644
--- a/module/project/test/lib/manageproducts.ui.class.php
+++ b/module/project/test/lib/ui/manageproducts.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class manageProductsTester extends tester
 {
     /**
diff --git a/module/project/test/lib/projectexport.ui.class.php b/module/project/test/lib/ui/projectexport.ui.class.php
similarity index 94%
rename from module/project/test/lib/projectexport.ui.class.php
rename to module/project/test/lib/ui/projectexport.ui.class.php
index f4d3bc79ab..ad4dcb8063 100644
--- a/module/project/test/lib/projectexport.ui.class.php
+++ b/module/project/test/lib/ui/projectexport.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class projectExportTester extends tester
 {
     /**
diff --git a/module/project/test/lib/projectexportforlite.ui.class.php b/module/project/test/lib/ui/projectexportforlite.ui.class.php
similarity index 95%
rename from module/project/test/lib/projectexportforlite.ui.class.php
rename to module/project/test/lib/ui/projectexportforlite.ui.class.php
index b2aebe2170..feb1bef83b 100644
--- a/module/project/test/lib/projectexportforlite.ui.class.php
+++ b/module/project/test/lib/ui/projectexportforlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class projectExportForLiteTester extends tester
 {
     /**
diff --git a/module/project/test/lib/startproject.ui.class.php b/module/project/test/lib/ui/startproject.ui.class.php
similarity index 98%
rename from module/project/test/lib/startproject.ui.class.php
rename to module/project/test/lib/ui/startproject.ui.class.php
index 1664d482e0..7316bbce15 100644
--- a/module/project/test/lib/startproject.ui.class.php
+++ b/module/project/test/lib/ui/startproject.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class startProjectTester extends tester
 {
     /**
diff --git a/module/project/test/lib/startprojectforlite.ui.class.php b/module/project/test/lib/ui/startprojectforlite.ui.class.php
similarity index 96%
rename from module/project/test/lib/startprojectforlite.ui.class.php
rename to module/project/test/lib/ui/startprojectforlite.ui.class.php
index 8fc11839a9..c61c251568 100644
--- a/module/project/test/lib/startprojectforlite.ui.class.php
+++ b/module/project/test/lib/ui/startprojectforlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class startProjectForLiteTester extends tester
 {
     /**
diff --git a/module/project/test/lib/suspendprojectforlite.ui.class.php b/module/project/test/lib/ui/suspendprojectforlite.ui.class.php
similarity index 96%
rename from module/project/test/lib/suspendprojectforlite.ui.class.php
rename to module/project/test/lib/ui/suspendprojectforlite.ui.class.php
index 139127216b..4e03a2624c 100644
--- a/module/project/test/lib/suspendprojectforlite.ui.class.php
+++ b/module/project/test/lib/ui/suspendprojectforlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class suspendProjectForLiteTester extends tester
 {
     /*
diff --git a/module/project/test/lib/team.ui.class.php b/module/project/test/lib/ui/team.ui.class.php
similarity index 93%
rename from module/project/test/lib/team.ui.class.php
rename to module/project/test/lib/ui/team.ui.class.php
index 3ec37b9912..b2461280e9 100644
--- a/module/project/test/lib/team.ui.class.php
+++ b/module/project/test/lib/ui/team.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class teamTester extends tester
 {
     /**
diff --git a/module/project/test/lib/teamforlite.ui.class.php b/module/project/test/lib/ui/teamforlite.ui.class.php
similarity index 94%
rename from module/project/test/lib/teamforlite.ui.class.php
rename to module/project/test/lib/ui/teamforlite.ui.class.php
index 89e48a1e6b..43f2f8a8db 100644
--- a/module/project/test/lib/teamforlite.ui.class.php
+++ b/module/project/test/lib/ui/teamforlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class teamTesterForLite extends tester
 {
     /**
diff --git a/module/project/test/lib/testcase.ui.class.php b/module/project/test/lib/ui/testcase.ui.class.php
similarity index 97%
rename from module/project/test/lib/testcase.ui.class.php
rename to module/project/test/lib/ui/testcase.ui.class.php
index 4ca095bb13..06521b404e 100644
--- a/module/project/test/lib/testcase.ui.class.php
+++ b/module/project/test/lib/ui/testcase.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class testcaseTester extends tester
 {
     /**
diff --git a/module/project/test/lib/testtask.ui.class.php b/module/project/test/lib/ui/testtask.ui.class.php
similarity index 97%
rename from module/project/test/lib/testtask.ui.class.php
rename to module/project/test/lib/ui/testtask.ui.class.php
index 9a6f06bbaa..f4ef616ebc 100644
--- a/module/project/test/lib/testtask.ui.class.php
+++ b/module/project/test/lib/ui/testtask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class testtaskTester extends tester
 {
     /**
diff --git a/module/project/test/ui/activebug.php b/module/project/test/ui/activebug.php
index 8a07f5ae0f..ba30080166 100755
--- a/module/project/test/ui/activebug.php
+++ b/module/project/test/ui/activebug.php
@@ -14,7 +14,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/bug.ui.class.php';
+include '../lib/ui/bug.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/project/test/ui/activeproject.php b/module/project/test/ui/activeproject.php
index c754440ae7..0b7f62ffb8 100755
--- a/module/project/test/ui/activeproject.php
+++ b/module/project/test/ui/activeproject.php
@@ -11,7 +11,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/activeproject.ui.class.php';
+include '../lib/ui/activeproject.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 $tester = new activeProjectTester();
diff --git a/module/project/test/ui/activeprojectlite.php b/module/project/test/ui/activeprojectlite.php
index 668c630c7a..ca3c2c527e 100755
--- a/module/project/test/ui/activeprojectlite.php
+++ b/module/project/test/ui/activeprojectlite.php
@@ -11,7 +11,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/activeprojectlite.ui.class.php';
+include '../lib/ui/activeprojectlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-4');
diff --git a/module/project/test/ui/batcheditproject.php b/module/project/test/ui/batcheditproject.php
index 2ce64bcb1a..b5e0e65708 100644
--- a/module/project/test/ui/batcheditproject.php
+++ b/module/project/test/ui/batcheditproject.php
@@ -22,7 +22,7 @@ cid=23
 
 */
 chdir(__DIR__);
-include '../lib/batcheditproject.ui.class.php';
+include '../lib/ui/batcheditproject.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-2');
diff --git a/module/project/test/ui/batcheditprojectlite.php b/module/project/test/ui/batcheditprojectlite.php
index cb8f553d76..9e76f4b920 100755
--- a/module/project/test/ui/batcheditprojectlite.php
+++ b/module/project/test/ui/batcheditprojectlite.php
@@ -22,7 +22,7 @@ cid=23
 
 */
 chdir(__DIR__);
-include '../lib/batcheditprojectlite.ui.class.php';
+include '../lib/ui/batcheditprojectlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-2');
diff --git a/module/project/test/ui/browsetab.php b/module/project/test/ui/browsetab.php
index fa3584668f..bdec2ad985 100644
--- a/module/project/test/ui/browsetab.php
+++ b/module/project/test/ui/browsetab.php
@@ -31,7 +31,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/browsetab.ui.class.php';
+include '../lib/ui/browsetab.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-9');
diff --git a/module/project/test/ui/browsetablite.php b/module/project/test/ui/browsetablite.php
index 7cebaf9944..0e5014aeb1 100755
--- a/module/project/test/ui/browsetablite.php
+++ b/module/project/test/ui/browsetablite.php
@@ -31,7 +31,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/browsetablite.ui.class.php';
+include '../lib/ui/browsetablite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-9');
diff --git a/module/project/test/ui/bug.php b/module/project/test/ui/bug.php
index bbe0083b34..8673841b38 100644
--- a/module/project/test/ui/bug.php
+++ b/module/project/test/ui/bug.php
@@ -32,7 +32,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/bug.ui.class.php';
+include '../lib/ui/bug.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/project/test/ui/closebug.php b/module/project/test/ui/closebug.php
index 540d83d8b0..33a3da5e40 100755
--- a/module/project/test/ui/closebug.php
+++ b/module/project/test/ui/closebug.php
@@ -14,7 +14,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/bug.ui.class.php';
+include '../lib/ui/bug.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/project/test/ui/closeproject.php b/module/project/test/ui/closeproject.php
index cfa00c0bb0..50c0247acb 100755
--- a/module/project/test/ui/closeproject.php
+++ b/module/project/test/ui/closeproject.php
@@ -11,7 +11,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/closeproject.ui.class.php';
+include '../lib/ui/closeproject.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 $tester = new closeProjectTester();
diff --git a/module/project/test/ui/closeprojectlite.php b/module/project/test/ui/closeprojectlite.php
index e078d2731e..0db6d2e68c 100755
--- a/module/project/test/ui/closeprojectlite.php
+++ b/module/project/test/ui/closeprojectlite.php
@@ -11,7 +11,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/closeprojectlite.ui.class.php';
+include '../lib/ui/closeprojectlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-7');
diff --git a/module/project/test/ui/createguide.php b/module/project/test/ui/createguide.php
index 13eb524c0e..578a46d216 100755
--- a/module/project/test/ui/createguide.php
+++ b/module/project/test/ui/createguide.php
@@ -16,7 +16,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/createguide.ui.class.php';
+include '../lib/ui/createguide.ui.class.php';
 
 $tester = new createGuideTester();
 $tester->login();
diff --git a/module/project/test/ui/createkanban.php b/module/project/test/ui/createkanban.php
index a0c3a15708..51074e828b 100755
--- a/module/project/test/ui/createkanban.php
+++ b/module/project/test/ui/createkanban.php
@@ -25,7 +25,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/createkanban.ui.class.php';
+include '../lib/ui/createkanban.ui.class.php';
 
 $tester = new createKanbanTester();
 $tester->login();
diff --git a/module/project/test/ui/createprojectlite.php b/module/project/test/ui/createprojectlite.php
index 4dcf92b3a8..d7f3f3d1c5 100755
--- a/module/project/test/ui/createprojectlite.php
+++ b/module/project/test/ui/createprojectlite.php
@@ -19,7 +19,7 @@ cid=23
 
 */
 chdir(__DIR__);
-include '../lib/createprojectlite.ui.class.php';
+include '../lib/ui/createprojectlite.ui.class.php';
 
 zendata('project')->gen(0);
 $tester = new createProjectLiteTester();
diff --git a/module/project/test/ui/createscrum.php b/module/project/test/ui/createscrum.php
index 2a68bf76cf..cb48012b04 100755
--- a/module/project/test/ui/createscrum.php
+++ b/module/project/test/ui/createscrum.php
@@ -25,7 +25,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/createscrum.ui.class.php';
+include '../lib/ui/createscrum.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(10);
 $tester = new createScrumTester();
diff --git a/module/project/test/ui/createsprint.php b/module/project/test/ui/createsprint.php
index 0475bd77b5..920f37b41e 100755
--- a/module/project/test/ui/createsprint.php
+++ b/module/project/test/ui/createsprint.php
@@ -20,7 +20,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/createsprint.ui.class.php';
+include '../lib/ui/createsprint.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 1)->gen(1);
 $tester = new createSprintTester();
diff --git a/module/project/test/ui/createwaterfall.php b/module/project/test/ui/createwaterfall.php
index 6f481c3563..98db062f10 100755
--- a/module/project/test/ui/createwaterfall.php
+++ b/module/project/test/ui/createwaterfall.php
@@ -26,7 +26,7 @@ cid=73
  */
 
 chdir(__DIR__);
-include '../lib/createwaterfall.ui.class.php';
+include '../lib/ui/createwaterfall.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 2)->gen(3);
 zendata('product')->loadYaml('product', false, 2)->gen(3);
diff --git a/module/project/test/ui/createwaterfallplus.php b/module/project/test/ui/createwaterfallplus.php
index 23bbc94b3b..995f70b390 100755
--- a/module/project/test/ui/createwaterfallplus.php
+++ b/module/project/test/ui/createwaterfallplus.php
@@ -20,7 +20,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/createwaterfallplus.ui.class.php';
+include '../lib/ui/createwaterfallplus.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-2');
diff --git a/module/project/test/ui/editproject.php b/module/project/test/ui/editproject.php
index 02485e0050..ea01db18fd 100755
--- a/module/project/test/ui/editproject.php
+++ b/module/project/test/ui/editproject.php
@@ -11,7 +11,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/editproject.ui.class.php';
+include '../lib/ui/editproject.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/project/test/ui/editprojectlite.php b/module/project/test/ui/editprojectlite.php
index 48b46a951e..a52757c1b0 100644
--- a/module/project/test/ui/editprojectlite.php
+++ b/module/project/test/ui/editprojectlite.php
@@ -22,7 +22,7 @@ cid=23
 
 */
 chdir(__DIR__);
-include '../lib/editprojectlite.ui.class.php';
+include '../lib/ui/editprojectlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-2');
diff --git a/module/project/test/ui/execution.php b/module/project/test/ui/execution.php
index 5888ff36f6..03ff7a76dd 100644
--- a/module/project/test/ui/execution.php
+++ b/module/project/test/ui/execution.php
@@ -31,7 +31,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/execution.ui.class.php';
+include '../lib/ui/execution.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-16');
diff --git a/module/project/test/ui/executionforlite.php b/module/project/test/ui/executionforlite.php
index 88cd8b6901..07c38885e8 100644
--- a/module/project/test/ui/executionforlite.php
+++ b/module/project/test/ui/executionforlite.php
@@ -31,7 +31,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/executionforlite.ui.class.php';
+include '../lib/ui/executionforlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-16');
diff --git a/module/project/test/ui/exportbug.php b/module/project/test/ui/exportbug.php
index 0590379229..9b2c89ba01 100755
--- a/module/project/test/ui/exportbug.php
+++ b/module/project/test/ui/exportbug.php
@@ -20,7 +20,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/bug.ui.class.php';
+include '../lib/ui/bug.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/project/test/ui/group.php b/module/project/test/ui/group.php
index d8df009e67..485ab41b1d 100755
--- a/module/project/test/ui/group.php
+++ b/module/project/test/ui/group.php
@@ -20,7 +20,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/group.ui.class.php';
+include '../lib/ui/group.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 1)->gen(1);
 zendata('group')->loadYaml('group')->gen(0);
diff --git a/module/project/test/ui/managemembers.php b/module/project/test/ui/managemembers.php
index ecb3df5540..ad0f809495 100755
--- a/module/project/test/ui/managemembers.php
+++ b/module/project/test/ui/managemembers.php
@@ -14,7 +14,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/managemembers.ui.class.php';
+include '../lib/ui/managemembers.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/project/test/ui/managemembersforlite.php b/module/project/test/ui/managemembersforlite.php
index 4273a64cce..1cd6dc2315 100755
--- a/module/project/test/ui/managemembersforlite.php
+++ b/module/project/test/ui/managemembersforlite.php
@@ -20,7 +20,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/managemembersforlite.ui.class.php';
+include '../lib/ui/managemembersforlite.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/project/test/ui/manageproducts.php b/module/project/test/ui/manageproducts.php
index 9e04753efd..e2909d7680 100755
--- a/module/project/test/ui/manageproducts.php
+++ b/module/project/test/ui/manageproducts.php
@@ -12,7 +12,7 @@ cid=1
 
  */
 chdir(__DIR__);
-include '../lib/manageproducts.ui.class.php';
+include '../lib/ui/manageproducts.ui.class.php';
 
 zendata('project')->loadYaml('execution', false, 2)->gen(10);
 zendata('product')->loadYaml('product', false, 2)->gen(10);
diff --git a/module/project/test/ui/projectexport.php b/module/project/test/ui/projectexport.php
index efe6afb3d9..b9e63c3f9f 100644
--- a/module/project/test/ui/projectexport.php
+++ b/module/project/test/ui/projectexport.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/projectexport.ui.class.php';
+include '../lib/ui/projectexport.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 1)->gen(1);
 zendata('projectproduct')->loadYaml('projectproduct', false, 1)->gen(1);
diff --git a/module/project/test/ui/projectexportforlite.php b/module/project/test/ui/projectexportforlite.php
index 1c2b42e1c9..ca7ba62dc4 100644
--- a/module/project/test/ui/projectexportforlite.php
+++ b/module/project/test/ui/projectexportforlite.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/projectexportforlite.ui.class.php';
+include '../lib/ui/projectexportforlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-3');
diff --git a/module/project/test/ui/resolvebug.php b/module/project/test/ui/resolvebug.php
index 7b94b0f4e5..919be53166 100755
--- a/module/project/test/ui/resolvebug.php
+++ b/module/project/test/ui/resolvebug.php
@@ -17,7 +17,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/bug.ui.class.php';
+include '../lib/ui/bug.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/project/test/ui/startproject.php b/module/project/test/ui/startproject.php
index bee9fcb07e..cf5c75e187 100755
--- a/module/project/test/ui/startproject.php
+++ b/module/project/test/ui/startproject.php
@@ -16,7 +16,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/startproject.ui.class.php';
+include '../lib/ui/startproject.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 1)->gen(1);
 
diff --git a/module/project/test/ui/startprojectforlite.php b/module/project/test/ui/startprojectforlite.php
index 93fe5d78b7..945295997a 100755
--- a/module/project/test/ui/startprojectforlite.php
+++ b/module/project/test/ui/startprojectforlite.php
@@ -13,7 +13,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/startprojectforlite.ui.class.php';
+include '../lib/ui/startprojectforlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/project/test/ui/suspendprojectforlite.php b/module/project/test/ui/suspendprojectforlite.php
index 75e63d3c28..21238e59d7 100755
--- a/module/project/test/ui/suspendprojectforlite.php
+++ b/module/project/test/ui/suspendprojectforlite.php
@@ -13,7 +13,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/suspendprojectforlite.ui.class.php';
+include '../lib/ui/suspendprojectforlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/project/test/ui/team.php b/module/project/test/ui/team.php
index 168d19202a..d25e982bed 100755
--- a/module/project/test/ui/team.php
+++ b/module/project/test/ui/team.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/team.ui.class.php';
+include '../lib/ui/team.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 1)->gen(1);
 zendata('team')->loadYaml('team', false, 1)->gen(5);
diff --git a/module/project/test/ui/teamforlite.php b/module/project/test/ui/teamforlite.php
index 8731971ff6..030fac44b2 100755
--- a/module/project/test/ui/teamforlite.php
+++ b/module/project/test/ui/teamforlite.php
@@ -12,7 +12,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/teamforlite.ui.class.php';
+include '../lib/ui/teamforlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/project/test/ui/testcase.php b/module/project/test/ui/testcase.php
index ae1079da78..8768c10863 100644
--- a/module/project/test/ui/testcase.php
+++ b/module/project/test/ui/testcase.php
@@ -29,7 +29,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/project/test/ui/testtask.php b/module/project/test/ui/testtask.php
index e4304d5993..19b1768878 100644
--- a/module/project/test/ui/testtask.php
+++ b/module/project/test/ui/testtask.php
@@ -20,7 +20,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/testtask.ui.class.php';
+include '../lib/ui/testtask.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-2');
diff --git a/module/projectbuild/test/lib/browse.ui.class.php b/module/projectbuild/test/lib/ui/browse.ui.class.php
similarity index 96%
rename from module/projectbuild/test/lib/browse.ui.class.php
rename to module/projectbuild/test/lib/ui/browse.ui.class.php
index 22b8037f64..eac6ab4a47 100644
--- a/module/projectbuild/test/lib/browse.ui.class.php
+++ b/module/projectbuild/test/lib/ui/browse.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTester extends tester
 {
     /**
diff --git a/module/projectbuild/test/lib/buildlinkbug.ui.class.php b/module/projectbuild/test/lib/ui/buildlinkbug.ui.class.php
similarity index 98%
rename from module/projectbuild/test/lib/buildlinkbug.ui.class.php
rename to module/projectbuild/test/lib/ui/buildlinkbug.ui.class.php
index a418823ac5..71ade6377a 100644
--- a/module/projectbuild/test/lib/buildlinkbug.ui.class.php
+++ b/module/projectbuild/test/lib/ui/buildlinkbug.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class buildLinkBugTester extends tester
 {
     /**
diff --git a/module/projectbuild/test/lib/buildlinkstory.ui.class.php b/module/projectbuild/test/lib/ui/buildlinkstory.ui.class.php
similarity index 97%
rename from module/projectbuild/test/lib/buildlinkstory.ui.class.php
rename to module/projectbuild/test/lib/ui/buildlinkstory.ui.class.php
index a7b45ee159..94ce4c134e 100644
--- a/module/projectbuild/test/lib/buildlinkstory.ui.class.php
+++ b/module/projectbuild/test/lib/ui/buildlinkstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class buildLinkStoryTester extends tester
 {
     /**
diff --git a/module/projectbuild/test/lib/createprojectbuild.ui.class.php b/module/projectbuild/test/lib/ui/createprojectbuild.ui.class.php
similarity index 98%
rename from module/projectbuild/test/lib/createprojectbuild.ui.class.php
rename to module/projectbuild/test/lib/ui/createprojectbuild.ui.class.php
index 473ce8c9fa..f7768d13e0 100755
--- a/module/projectbuild/test/lib/createprojectbuild.ui.class.php
+++ b/module/projectbuild/test/lib/ui/createprojectbuild.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProjectBuildTester extends tester
 {
     /**
diff --git a/module/projectbuild/test/lib/editprojectbuild.ui.class.php b/module/projectbuild/test/lib/ui/editprojectbuild.ui.class.php
similarity index 97%
rename from module/projectbuild/test/lib/editprojectbuild.ui.class.php
rename to module/projectbuild/test/lib/ui/editprojectbuild.ui.class.php
index 1c737d7399..f971c65033 100755
--- a/module/projectbuild/test/lib/editprojectbuild.ui.class.php
+++ b/module/projectbuild/test/lib/ui/editprojectbuild.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editProjectBuildTester extends tester
 {
     /**
diff --git a/module/projectbuild/test/lib/view.ui.class.php b/module/projectbuild/test/lib/ui/view.ui.class.php
similarity index 97%
rename from module/projectbuild/test/lib/view.ui.class.php
rename to module/projectbuild/test/lib/ui/view.ui.class.php
index 146dff4a56..4539fbee5d 100644
--- a/module/projectbuild/test/lib/view.ui.class.php
+++ b/module/projectbuild/test/lib/ui/view.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class buildViewTester extends tester
 {
     /**
diff --git a/module/projectbuild/test/ui/browse.php b/module/projectbuild/test/ui/browse.php
index d583eadbdc..f40c6d9478 100755
--- a/module/projectbuild/test/ui/browse.php
+++ b/module/projectbuild/test/ui/browse.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1,2');
diff --git a/module/projectbuild/test/ui/buildlinkbug.php b/module/projectbuild/test/ui/buildlinkbug.php
index bc70b48b3f..9e1f8742bc 100755
--- a/module/projectbuild/test/ui/buildlinkbug.php
+++ b/module/projectbuild/test/ui/buildlinkbug.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/buildlinkbug.ui.class.php';
+include '../lib/ui/buildlinkbug.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectbuild/test/ui/buildlinkstory.php b/module/projectbuild/test/ui/buildlinkstory.php
index e1f2d8badd..bb3297e7c6 100644
--- a/module/projectbuild/test/ui/buildlinkstory.php
+++ b/module/projectbuild/test/ui/buildlinkstory.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/buildlinkstory.ui.class.php';
+include '../lib/ui/buildlinkstory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectbuild/test/ui/createprojectbuild.php b/module/projectbuild/test/ui/createprojectbuild.php
index 1b2c83d46c..9ee99b8ac9 100755
--- a/module/projectbuild/test/ui/createprojectbuild.php
+++ b/module/projectbuild/test/ui/createprojectbuild.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/createprojectbuild.ui.class.php';
+include '../lib/ui/createprojectbuild.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectbuild/test/ui/editprojectbuild.php b/module/projectbuild/test/ui/editprojectbuild.php
index d31d49f7a7..ada516ce87 100755
--- a/module/projectbuild/test/ui/editprojectbuild.php
+++ b/module/projectbuild/test/ui/editprojectbuild.php
@@ -16,7 +16,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/editprojectbuild.ui.class.php';
+include '../lib/ui/editprojectbuild.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectbuild/test/ui/view.php b/module/projectbuild/test/ui/view.php
index 7789f17c58..afce3fc933 100644
--- a/module/projectbuild/test/ui/view.php
+++ b/module/projectbuild/test/ui/view.php
@@ -13,7 +13,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectrelease/test/lib/browse.ui.class.php b/module/projectrelease/test/lib/ui/browse.ui.class.php
similarity index 98%
rename from module/projectrelease/test/lib/browse.ui.class.php
rename to module/projectrelease/test/lib/ui/browse.ui.class.php
index 842d2211f1..0044c9a382 100644
--- a/module/projectrelease/test/lib/browse.ui.class.php
+++ b/module/projectrelease/test/lib/ui/browse.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTester extends tester
 {
     /**
diff --git a/module/projectrelease/test/lib/createprojectrelease.ui.class.php b/module/projectrelease/test/lib/ui/createprojectrelease.ui.class.php
similarity index 98%
rename from module/projectrelease/test/lib/createprojectrelease.ui.class.php
rename to module/projectrelease/test/lib/ui/createprojectrelease.ui.class.php
index 3829543bc7..042c0d6504 100644
--- a/module/projectrelease/test/lib/createprojectrelease.ui.class.php
+++ b/module/projectrelease/test/lib/ui/createprojectrelease.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createProjectReleaseTester extends tester
 {
     /**
diff --git a/module/projectrelease/test/lib/editprojectrelease.ui.class.php b/module/projectrelease/test/lib/ui/editprojectrelease.ui.class.php
similarity index 98%
rename from module/projectrelease/test/lib/editprojectrelease.ui.class.php
rename to module/projectrelease/test/lib/ui/editprojectrelease.ui.class.php
index 18da846fb3..610f46628d 100755
--- a/module/projectrelease/test/lib/editprojectrelease.ui.class.php
+++ b/module/projectrelease/test/lib/ui/editprojectrelease.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editProjectReleaseTester extends tester
 {
     /**
diff --git a/module/projectrelease/test/lib/releaseexport.ui.class.php b/module/projectrelease/test/lib/ui/releaseexport.ui.class.php
similarity index 97%
rename from module/projectrelease/test/lib/releaseexport.ui.class.php
rename to module/projectrelease/test/lib/ui/releaseexport.ui.class.php
index c939bf7786..6ed4485623 100644
--- a/module/projectrelease/test/lib/releaseexport.ui.class.php
+++ b/module/projectrelease/test/lib/ui/releaseexport.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class releaseExportTester extends tester
 {
     /**
diff --git a/module/projectrelease/test/lib/releaselinkbug.ui.class.php b/module/projectrelease/test/lib/ui/releaselinkbug.ui.class.php
similarity index 98%
rename from module/projectrelease/test/lib/releaselinkbug.ui.class.php
rename to module/projectrelease/test/lib/ui/releaselinkbug.ui.class.php
index 122877362a..d1fdbf0fd7 100644
--- a/module/projectrelease/test/lib/releaselinkbug.ui.class.php
+++ b/module/projectrelease/test/lib/ui/releaselinkbug.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class releaseLinkBugTester extends tester
 {
     /**
diff --git a/module/projectrelease/test/lib/releaselinkstory.ui.class.php b/module/projectrelease/test/lib/ui/releaselinkstory.ui.class.php
similarity index 98%
rename from module/projectrelease/test/lib/releaselinkstory.ui.class.php
rename to module/projectrelease/test/lib/ui/releaselinkstory.ui.class.php
index 0498395c3d..843248d79c 100644
--- a/module/projectrelease/test/lib/releaselinkstory.ui.class.php
+++ b/module/projectrelease/test/lib/ui/releaselinkstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class releaseLinkStoryTester extends tester
 {
     /**
diff --git a/module/projectrelease/test/lib/view.ui.class.php b/module/projectrelease/test/lib/ui/view.ui.class.php
similarity index 96%
rename from module/projectrelease/test/lib/view.ui.class.php
rename to module/projectrelease/test/lib/ui/view.ui.class.php
index 2a08f59186..94ba9d07c9 100644
--- a/module/projectrelease/test/lib/view.ui.class.php
+++ b/module/projectrelease/test/lib/ui/view.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewTester extends tester
 {
     /**
diff --git a/module/projectrelease/test/ui/browse.php b/module/projectrelease/test/ui/browse.php
index 75627da197..47952baaa8 100755
--- a/module/projectrelease/test/ui/browse.php
+++ b/module/projectrelease/test/ui/browse.php
@@ -13,7 +13,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 1)->gen(1);
 zendata('product')->loadYaml('product', false, 1)->gen(1);
diff --git a/module/projectrelease/test/ui/createprojectrelease.php b/module/projectrelease/test/ui/createprojectrelease.php
index dfd5aab02b..5c6865fa1a 100755
--- a/module/projectrelease/test/ui/createprojectrelease.php
+++ b/module/projectrelease/test/ui/createprojectrelease.php
@@ -14,7 +14,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/createprojectrelease.ui.class.php';
+include '../lib/ui/createprojectrelease.ui.class.php';
 
 zendata('project')->loadYaml('project', false, 1)->gen(1);
 zendata('product')->loadYaml('product', false, 1)->gen(1);
diff --git a/module/projectrelease/test/ui/editprojectrelease.php b/module/projectrelease/test/ui/editprojectrelease.php
index 2f3d771e64..163f0f21ba 100755
--- a/module/projectrelease/test/ui/editprojectrelease.php
+++ b/module/projectrelease/test/ui/editprojectrelease.php
@@ -28,7 +28,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/editprojectrelease.ui.class.php';
+include '../lib/ui/editprojectrelease.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectrelease/test/ui/releaseexport.php b/module/projectrelease/test/ui/releaseexport.php
index 3e347b3277..1233270997 100644
--- a/module/projectrelease/test/ui/releaseexport.php
+++ b/module/projectrelease/test/ui/releaseexport.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/releaseexport.ui.class.php';
+include '../lib/ui/releaseexport.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectrelease/test/ui/releaselinkbug.php b/module/projectrelease/test/ui/releaselinkbug.php
index eca1d0d192..865319348c 100644
--- a/module/projectrelease/test/ui/releaselinkbug.php
+++ b/module/projectrelease/test/ui/releaselinkbug.php
@@ -18,7 +18,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/releaselinkbug.ui.class.php';
+include '../lib/ui/releaselinkbug.ui.class.php';
 
 zendata('bug')->loadYaml('bug', false, 1)->gen(5);
 zendata('release')->loadYaml('projectrelease', false, 1)->gen(1);
diff --git a/module/projectrelease/test/ui/releaselinkstory.php b/module/projectrelease/test/ui/releaselinkstory.php
index 3a9f48832d..e66ec034af 100644
--- a/module/projectrelease/test/ui/releaselinkstory.php
+++ b/module/projectrelease/test/ui/releaselinkstory.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/releaselinkstory.ui.class.php';
+include '../lib/ui/releaselinkstory.ui.class.php';
 
 zendata('story')->loadYaml('story', false, 1)->gen(5);
 zendata('release')->loadYaml('projectrelease', false, 1)->gen(1);
diff --git a/module/projectrelease/test/ui/view.php b/module/projectrelease/test/ui/view.php
index dc5659b476..40b145407f 100644
--- a/module/projectrelease/test/ui/view.php
+++ b/module/projectrelease/test/ui/view.php
@@ -13,7 +13,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 zendata('release')->loadYaml('projectrelease', false, 1)->gen(1);
 $tester = new viewTester();
diff --git a/module/projectstory/test/lib/assign.ui.class.php b/module/projectstory/test/lib/ui/assign.ui.class.php
similarity index 97%
rename from module/projectstory/test/lib/assign.ui.class.php
rename to module/projectstory/test/lib/ui/assign.ui.class.php
index 34ace5c50e..887a17860c 100755
--- a/module/projectstory/test/lib/assign.ui.class.php
+++ b/module/projectstory/test/lib/ui/assign.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class assignStoryTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/assigninlite.ui.class.php b/module/projectstory/test/lib/ui/assigninlite.ui.class.php
similarity index 97%
rename from module/projectstory/test/lib/assigninlite.ui.class.php
rename to module/projectstory/test/lib/ui/assigninlite.ui.class.php
index 484d563a01..f0e926085c 100755
--- a/module/projectstory/test/lib/assigninlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/assigninlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class assign extends tester
 {
     /**
diff --git a/module/story/test/lib/batchcreateinlite.ui.class.php b/module/projectstory/test/lib/ui/batchcreateinlite.ui.class.php
similarity index 98%
rename from module/story/test/lib/batchcreateinlite.ui.class.php
rename to module/projectstory/test/lib/ui/batchcreateinlite.ui.class.php
index 638022dc88..74ee003455 100755
--- a/module/story/test/lib/batchcreateinlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/batchcreateinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchCreateStory extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/batcheditstoryinlite.ui.class.php b/module/projectstory/test/lib/ui/batcheditstoryinlite.ui.class.php
similarity index 96%
rename from module/projectstory/test/lib/batcheditstoryinlite.ui.class.php
rename to module/projectstory/test/lib/ui/batcheditstoryinlite.ui.class.php
index 4e8f447b84..3ffbe59296 100755
--- a/module/projectstory/test/lib/batcheditstoryinlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/batcheditstoryinlite.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class batchEditStoryInLiteTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/changestatusinlite.ui.class.php b/module/projectstory/test/lib/ui/changestatusinlite.ui.class.php
similarity index 99%
rename from module/projectstory/test/lib/changestatusinlite.ui.class.php
rename to module/projectstory/test/lib/ui/changestatusinlite.ui.class.php
index 15663ca8d1..a2cd0928a9 100755
--- a/module/projectstory/test/lib/changestatusinlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/changestatusinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class changeStatus extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/changestoryinlite.ui.class.php b/module/projectstory/test/lib/ui/changestoryinlite.ui.class.php
similarity index 98%
rename from module/projectstory/test/lib/changestoryinlite.ui.class.php
rename to module/projectstory/test/lib/ui/changestoryinlite.ui.class.php
index 8c9723c868..d9aa6bd480 100755
--- a/module/projectstory/test/lib/changestoryinlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/changestoryinlite.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class changeStoryInLiteTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/checktab.ui.class.php b/module/projectstory/test/lib/ui/checktab.ui.class.php
similarity index 94%
rename from module/projectstory/test/lib/checktab.ui.class.php
rename to module/projectstory/test/lib/ui/checktab.ui.class.php
index e7bd2d8b70..bc44ff0d14 100755
--- a/module/projectstory/test/lib/checktab.ui.class.php
+++ b/module/projectstory/test/lib/ui/checktab.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class checkTabTester extends tester
 {
     /**
diff --git a/module/story/test/lib/createstoryinlite.ui.class.php b/module/projectstory/test/lib/ui/createstoryinlite.ui.class.php
similarity index 98%
rename from module/story/test/lib/createstoryinlite.ui.class.php
rename to module/projectstory/test/lib/ui/createstoryinlite.ui.class.php
index 551d4469be..55ab47ad58 100755
--- a/module/story/test/lib/createstoryinlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/createstoryinlite.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class createStoryInLiteTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/editstoryinlite.ui.class.php b/module/projectstory/test/lib/ui/editstoryinlite.ui.class.php
similarity index 96%
rename from module/projectstory/test/lib/editstoryinlite.ui.class.php
rename to module/projectstory/test/lib/ui/editstoryinlite.ui.class.php
index 479542ec11..3e0b422b04 100755
--- a/module/projectstory/test/lib/editstoryinlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/editstoryinlite.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class editStoryInLiteTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/export.ui.class.php b/module/projectstory/test/lib/ui/export.ui.class.php
similarity index 95%
rename from module/projectstory/test/lib/export.ui.class.php
rename to module/projectstory/test/lib/ui/export.ui.class.php
index 63366415c3..206c9772c7 100755
--- a/module/projectstory/test/lib/export.ui.class.php
+++ b/module/projectstory/test/lib/ui/export.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class exportTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/linkstory.ui.class.php b/module/projectstory/test/lib/ui/linkstory.ui.class.php
similarity index 94%
rename from module/projectstory/test/lib/linkstory.ui.class.php
rename to module/projectstory/test/lib/ui/linkstory.ui.class.php
index 421e5e8715..d052aba52a 100755
--- a/module/projectstory/test/lib/linkstory.ui.class.php
+++ b/module/projectstory/test/lib/ui/linkstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class linkStoryTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/switchtabinlite.ui.class.php b/module/projectstory/test/lib/ui/switchtabinlite.ui.class.php
similarity index 95%
rename from module/projectstory/test/lib/switchtabinlite.ui.class.php
rename to module/projectstory/test/lib/ui/switchtabinlite.ui.class.php
index e30a8f2e6c..7b31c573fa 100755
--- a/module/projectstory/test/lib/switchtabinlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/switchtabinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class switchTab extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/unlinkstory.ui.class.php b/module/projectstory/test/lib/ui/unlinkstory.ui.class.php
similarity index 97%
rename from module/projectstory/test/lib/unlinkstory.ui.class.php
rename to module/projectstory/test/lib/ui/unlinkstory.ui.class.php
index 0e9171af7d..1454772190 100755
--- a/module/projectstory/test/lib/unlinkstory.ui.class.php
+++ b/module/projectstory/test/lib/ui/unlinkstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class unLinkStoryTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/viewinlite.ui.class.php b/module/projectstory/test/lib/ui/viewinlite.ui.class.php
similarity index 95%
rename from module/projectstory/test/lib/viewinlite.ui.class.php
rename to module/projectstory/test/lib/ui/viewinlite.ui.class.php
index ca1bccdc0a..5637927c71 100755
--- a/module/projectstory/test/lib/viewinlite.ui.class.php
+++ b/module/projectstory/test/lib/ui/viewinlite.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class viewInLiteTester extends tester
 {
    /*
diff --git a/module/projectstory/test/ui/assign.php b/module/projectstory/test/ui/assign.php
index e81d4a9c13..d5d78bf7f7 100755
--- a/module/projectstory/test/ui/assign.php
+++ b/module/projectstory/test/ui/assign.php
@@ -17,7 +17,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/assign.ui.class.php';
+include '../lib/ui/assign.ui.class.php';
 global $config;
 
 $product = zenData('product');
diff --git a/module/projectstory/test/ui/assigninlite.php b/module/projectstory/test/ui/assigninlite.php
index e91d3dd93f..cb91e1f90b 100755
--- a/module/projectstory/test/ui/assigninlite.php
+++ b/module/projectstory/test/ui/assigninlite.php
@@ -13,7 +13,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/assigninlite.ui.class.php';
+include '../lib/ui/assigninlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/projectstory/test/ui/batchassigninlite.php b/module/projectstory/test/ui/batchassigninlite.php
index 1eebb73620..85688c9563 100755
--- a/module/projectstory/test/ui/batchassigninlite.php
+++ b/module/projectstory/test/ui/batchassigninlite.php
@@ -13,7 +13,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/assigninlite.ui.class.php';
+include '../lib/ui/assigninlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/projectstory/test/ui/batchcreateinlite.php b/module/projectstory/test/ui/batchcreateinlite.php
index 3030042a5b..244e86f7eb 100755
--- a/module/projectstory/test/ui/batchcreateinlite.php
+++ b/module/projectstory/test/ui/batchcreateinlite.php
@@ -14,7 +14,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/batchcreateinlite.ui.class.php';
+include '../lib/ui/batchcreateinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/projectstory/test/ui/batcheditinlite.php b/module/projectstory/test/ui/batcheditinlite.php
index 10b4185e46..8470bff23c 100755
--- a/module/projectstory/test/ui/batcheditinlite.php
+++ b/module/projectstory/test/ui/batcheditinlite.php
@@ -10,7 +10,7 @@ cid=90
 
 */
 chdir (__DIR__);
-include '../lib/batcheditstoryinlite.ui.class.php';
+include '../lib/ui/batcheditstoryinlite.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectstory/test/ui/changestoryinlite.php b/module/projectstory/test/ui/changestoryinlite.php
index e3aad116d1..e338456251 100755
--- a/module/projectstory/test/ui/changestoryinlite.php
+++ b/module/projectstory/test/ui/changestoryinlite.php
@@ -19,7 +19,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/changestoryinlite.ui.class.php';
+include '../lib/ui/changestoryinlite.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectstory/test/ui/changestorystatusinlite.php b/module/projectstory/test/ui/changestorystatusinlite.php
index 9448d4c709..8775902dbd 100755
--- a/module/projectstory/test/ui/changestorystatusinlite.php
+++ b/module/projectstory/test/ui/changestorystatusinlite.php
@@ -15,7 +15,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/changestatusinlite.ui.class.php';
+include '../lib/ui/changestatusinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/projectstory/test/ui/checktab.php b/module/projectstory/test/ui/checktab.php
index a94961f53e..de86872011 100755
--- a/module/projectstory/test/ui/checktab.php
+++ b/module/projectstory/test/ui/checktab.php
@@ -35,7 +35,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/checktab.ui.class.php';
+include '../lib/ui/checktab.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectstory/test/ui/creatstoryinlite.php b/module/projectstory/test/ui/creatstoryinlite.php
index 566d66f0db..15f84aa3ec 100755
--- a/module/projectstory/test/ui/creatstoryinlite.php
+++ b/module/projectstory/test/ui/creatstoryinlite.php
@@ -19,7 +19,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/createstoryinlite.ui.class.php';
+include '../lib/ui/createstoryinlite.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectstory/test/ui/editstoryinlite.php b/module/projectstory/test/ui/editstoryinlite.php
index 98dcdda158..cf5d37a211 100755
--- a/module/projectstory/test/ui/editstoryinlite.php
+++ b/module/projectstory/test/ui/editstoryinlite.php
@@ -10,7 +10,7 @@ cid=90
 
 */
 chdir (__DIR__);
-include '../lib/editstoryinlite.ui.class.php';
+include '../lib/ui/editstoryinlite.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectstory/test/ui/export.php b/module/projectstory/test/ui/export.php
index 72644b125d..b18087cba5 100755
--- a/module/projectstory/test/ui/export.php
+++ b/module/projectstory/test/ui/export.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/export.ui.class.php';
+include '../lib/ui/export.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectstory/test/ui/linkstory.php b/module/projectstory/test/ui/linkstory.php
index d7bcdc6275..54d13448e0 100755
--- a/module/projectstory/test/ui/linkstory.php
+++ b/module/projectstory/test/ui/linkstory.php
@@ -14,7 +14,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/linkstory.ui.class.php';
+include '../lib/ui/linkstory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectstory/test/ui/reviewstoryinlite.php b/module/projectstory/test/ui/reviewstoryinlite.php
index 2e4685fa9a..0676319e70 100755
--- a/module/projectstory/test/ui/reviewstoryinlite.php
+++ b/module/projectstory/test/ui/reviewstoryinlite.php
@@ -21,7 +21,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/changestatusinlite.ui.class.php';
+include '../lib/ui/changestatusinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/projectstory/test/ui/revokestoryinlite.php b/module/projectstory/test/ui/revokestoryinlite.php
index 57ec45daa1..b913ab8072 100755
--- a/module/projectstory/test/ui/revokestoryinlite.php
+++ b/module/projectstory/test/ui/revokestoryinlite.php
@@ -13,7 +13,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/changestatusinlite.ui.class.php';
+include '../lib/ui/changestatusinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/projectstory/test/ui/submitreviewinlite.php b/module/projectstory/test/ui/submitreviewinlite.php
index 220fcc9047..6d297ea7af 100755
--- a/module/projectstory/test/ui/submitreviewinlite.php
+++ b/module/projectstory/test/ui/submitreviewinlite.php
@@ -13,7 +13,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/changestatusinlite.ui.class.php';
+include '../lib/ui/changestatusinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/projectstory/test/ui/switchtabinlite.php b/module/projectstory/test/ui/switchtabinlite.php
index f71316bf1a..b17479e9ad 100755
--- a/module/projectstory/test/ui/switchtabinlite.php
+++ b/module/projectstory/test/ui/switchtabinlite.php
@@ -24,7 +24,7 @@ cid=0
 
 */
 chdir(__DIR__);
-include '../lib/switchtabinlite.ui.class.php';
+include '../lib/ui/switchtabinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/projectstory/test/ui/unlinkstory.php b/module/projectstory/test/ui/unlinkstory.php
index 20f04fa295..926859ec58 100755
--- a/module/projectstory/test/ui/unlinkstory.php
+++ b/module/projectstory/test/ui/unlinkstory.php
@@ -16,7 +16,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/unlinkstory.ui.class.php';
+include '../lib/ui/unlinkstory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/projectstory/test/ui/viewinlite.php b/module/projectstory/test/ui/viewinlite.php
index 83594c48a8..cb065df6b8 100755
--- a/module/projectstory/test/ui/viewinlite.php
+++ b/module/projectstory/test/ui/viewinlite.php
@@ -10,7 +10,7 @@ cid=90
 
 */
 chdir (__DIR__);
-include '../lib/viewinlite.ui.class.php';
+include '../lib/ui/viewinlite.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/release/test/lib/createrelease.ui.class.php b/module/release/test/lib/ui/createrelease.ui.class.php
similarity index 95%
rename from module/release/test/lib/createrelease.ui.class.php
rename to module/release/test/lib/ui/createrelease.ui.class.php
index 2301ff2081..f49203fd92 100644
--- a/module/release/test/lib/createrelease.ui.class.php
+++ b/module/release/test/lib/ui/createrelease.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createReleaseTeaster extends Tester
 {
     /**
diff --git a/module/release/test/lib/editrelease.ui.class.php b/module/release/test/lib/ui/editrelease.ui.class.php
similarity index 98%
rename from module/release/test/lib/editrelease.ui.class.php
rename to module/release/test/lib/ui/editrelease.ui.class.php
index 125d3d0328..ac2d1b2bb1 100755
--- a/module/release/test/lib/editrelease.ui.class.php
+++ b/module/release/test/lib/ui/editrelease.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editReleaseTester extends tester
 {
     /**
diff --git a/module/release/test/lib/exporthtml.ui.class.php b/module/release/test/lib/ui/exporthtml.ui.class.php
similarity index 96%
rename from module/release/test/lib/exporthtml.ui.class.php
rename to module/release/test/lib/ui/exporthtml.ui.class.php
index d06e6b1b88..b2e506813f 100644
--- a/module/release/test/lib/exporthtml.ui.class.php
+++ b/module/release/test/lib/ui/exporthtml.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class exportHtmlTester extends tester
 {
     /**
diff --git a/module/release/test/lib/releaselinkbug.ui.class.php b/module/release/test/lib/ui/releaselinkbug.ui.class.php
similarity index 98%
rename from module/release/test/lib/releaselinkbug.ui.class.php
rename to module/release/test/lib/ui/releaselinkbug.ui.class.php
index 0774e59e83..320df7f646 100644
--- a/module/release/test/lib/releaselinkbug.ui.class.php
+++ b/module/release/test/lib/ui/releaselinkbug.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class releaseLinkBugTester extends tester
 {
     /**
diff --git a/module/release/test/lib/releaselinkstory.ui.class.php b/module/release/test/lib/ui/releaselinkstory.ui.class.php
similarity index 97%
rename from module/release/test/lib/releaselinkstory.ui.class.php
rename to module/release/test/lib/ui/releaselinkstory.ui.class.php
index a52659f87f..56e4923b10 100755
--- a/module/release/test/lib/releaselinkstory.ui.class.php
+++ b/module/release/test/lib/ui/releaselinkstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class releaseLinkStoryTester extends tester
 {
     /**
diff --git a/module/release/test/ui/createrelease.php b/module/release/test/ui/createrelease.php
index 74320f3267..6fff9615f7 100644
--- a/module/release/test/ui/createrelease.php
+++ b/module/release/test/ui/createrelease.php
@@ -9,7 +9,7 @@ cid=80
 
 */
 chdir(__DIR__);
-include '../lib/createrelease.ui.class.php';
+include '../lib/ui/createrelease.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/release/test/ui/editrelease.php b/module/release/test/ui/editrelease.php
index 21b287c943..d532a04cf0 100755
--- a/module/release/test/ui/editrelease.php
+++ b/module/release/test/ui/editrelease.php
@@ -28,7 +28,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/editrelease.ui.class.php';
+include '../lib/ui/editrelease.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/release/test/ui/exporthtml.php b/module/release/test/ui/exporthtml.php
index 50730a39ab..c700374956 100755
--- a/module/release/test/ui/exporthtml.php
+++ b/module/release/test/ui/exporthtml.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/exporthtml.ui.class.php';
+include '../lib/ui/exporthtml.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/release/test/ui/releaselinkbug.php b/module/release/test/ui/releaselinkbug.php
index e1dc68076c..7a193c8152 100755
--- a/module/release/test/ui/releaselinkbug.php
+++ b/module/release/test/ui/releaselinkbug.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/releaselinkbug.ui.class.php';
+include '../lib/ui/releaselinkbug.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/release/test/ui/releaselinkstory.php b/module/release/test/ui/releaselinkstory.php
index f620326a7b..35a4b464cc 100755
--- a/module/release/test/ui/releaselinkstory.php
+++ b/module/release/test/ui/releaselinkstory.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/releaselinkstory.ui.class.php';
+include '../lib/ui/releaselinkstory.ui.class.php';
 
 $product = zenData('product');
 $product->gen(0);
diff --git a/module/repo/test/lib/repo.ui.class.php b/module/repo/test/lib/ui/repo.ui.class.php
similarity index 96%
rename from module/repo/test/lib/repo.ui.class.php
rename to module/repo/test/lib/ui/repo.ui.class.php
index 3ef42d236d..eb09faef46 100644
--- a/module/repo/test/lib/repo.ui.class.php
+++ b/module/repo/test/lib/ui/repo.ui.class.php
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 
 class repo extends tester
 {
diff --git a/module/repo/test/ui/createmaintain.php b/module/repo/test/ui/createmaintain.php
index 948cabc605..eb735aa140 100644
--- a/module/repo/test/ui/createmaintain.php
+++ b/module/repo/test/ui/createmaintain.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/repo.ui.class.php';
+include '../lib/ui/repo.ui.class.php';
 
 $tester = new repo();
 $maintain = array(
diff --git a/module/repo/test/ui/maintain.php b/module/repo/test/ui/maintain.php
index 150cc03b6f..add1928be5 100644
--- a/module/repo/test/ui/maintain.php
+++ b/module/repo/test/ui/maintain.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/repo.ui.class.php';
+include '../lib/ui/repo.ui.class.php';
 
 $repo = zenData('repo')->loadYaml('repo', false, 2)->gen(5);
 $tester = new repo();
diff --git a/module/requirement/test/lib/closerequirement.ui.class.php b/module/requirement/test/lib/ui/closerequirement.ui.class.php
similarity index 98%
rename from module/requirement/test/lib/closerequirement.ui.class.php
rename to module/requirement/test/lib/ui/closerequirement.ui.class.php
index a186511dd9..36ce5037a7 100644
--- a/module/requirement/test/lib/closerequirement.ui.class.php
+++ b/module/requirement/test/lib/ui/closerequirement.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 /**
     * The control file of example module of ZenTaoPMS.
     *
diff --git a/module/requirement/test/ui/closerequirement.php b/module/requirement/test/ui/closerequirement.php
index 6e05701573..3615ec0174 100755
--- a/module/requirement/test/ui/closerequirement.php
+++ b/module/requirement/test/ui/closerequirement.php
@@ -10,7 +10,7 @@ cid=91
 
 */
 chdir (__DIR__);
-include '../lib/closerequirement.ui.class.php';
+include '../lib/ui/closerequirement.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/space/test/lib/space.ui.class.php b/module/space/test/lib/ui/space.ui.class.php
similarity index 92%
rename from module/space/test/lib/space.ui.class.php
rename to module/space/test/lib/ui/space.ui.class.php
index 2cbd2798dd..bd13ef9639 100644
--- a/module/space/test/lib/space.ui.class.php
+++ b/module/space/test/lib/ui/space.ui.class.php
@@ -1,6 +1,6 @@
 #!/usr/bin/env php
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class space extends tester
 {
     public function createApplication($url = array(), $application = array())
diff --git a/module/space/test/ui/createapplication.php b/module/space/test/ui/createapplication.php
index 79a0148700..51cf3738c3 100644
--- a/module/space/test/ui/createapplication.php
+++ b/module/space/test/ui/createapplication.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 chdir(__DIR__);
-include '../lib/space.ui.class.php';
+include '../lib/ui/space.ui.class.php';
 $tester = new space();
 function randomString($length = 4)
 {
diff --git a/module/stage/test/lib/batchcreatestage.ui.class.php b/module/stage/test/lib/ui/batchcreatestage.ui.class.php
similarity index 97%
rename from module/stage/test/lib/batchcreatestage.ui.class.php
rename to module/stage/test/lib/ui/batchcreatestage.ui.class.php
index 13fb807c38..ead8e048fe 100755
--- a/module/stage/test/lib/batchcreatestage.ui.class.php
+++ b/module/stage/test/lib/ui/batchcreatestage.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchCreateStageTester extends tester
 {
     /**
diff --git a/module/stage/test/lib/createstage.ui.class.php b/module/stage/test/lib/ui/createstage.ui.class.php
similarity index 97%
rename from module/stage/test/lib/createstage.ui.class.php
rename to module/stage/test/lib/ui/createstage.ui.class.php
index 5b8d96bd13..d655708c2a 100755
--- a/module/stage/test/lib/createstage.ui.class.php
+++ b/module/stage/test/lib/ui/createstage.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createStageTester extends tester
 {
     /**
diff --git a/module/stage/test/lib/editstage.ui.class.php b/module/stage/test/lib/ui/editstage.ui.class.php
similarity index 97%
rename from module/stage/test/lib/editstage.ui.class.php
rename to module/stage/test/lib/ui/editstage.ui.class.php
index 84c301cda5..2dcf31bd8a 100755
--- a/module/stage/test/lib/editstage.ui.class.php
+++ b/module/stage/test/lib/ui/editstage.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editStageTester extends tester
 {
     /**
diff --git a/module/stage/test/ui/batchcreatestage.php b/module/stage/test/ui/batchcreatestage.php
index bf192e2e9b..b0af665074 100755
--- a/module/stage/test/ui/batchcreatestage.php
+++ b/module/stage/test/ui/batchcreatestage.php
@@ -34,7 +34,7 @@ cid=3
 
 */
 chdir(__DIR__);
-include '../lib/batchcreatestage.ui.class.php';
+include '../lib/ui/batchcreatestage.ui.class.php';
 
 $stage = zendata('stage');
 $stage->id->range('1-12');
diff --git a/module/stage/test/ui/createstage.php b/module/stage/test/ui/createstage.php
index 8b56bbb438..b4d28ecf0d 100755
--- a/module/stage/test/ui/createstage.php
+++ b/module/stage/test/ui/createstage.php
@@ -20,7 +20,7 @@ cid=1
 
 */
 chdir(__DIR__);
-include '../lib/createstage.ui.class.php';
+include '../lib/ui/createstage.ui.class.php';
 
 $stage = zendata('stage');
 $stage->id->range('1-12');
diff --git a/module/stage/test/ui/editstage.php b/module/stage/test/ui/editstage.php
index f15a3d01e2..7422031dc1 100755
--- a/module/stage/test/ui/editstage.php
+++ b/module/stage/test/ui/editstage.php
@@ -22,7 +22,7 @@ cid=2
 
 */
 chdir(__DIR__);
-include '../lib/editstage.ui.class.php';
+include '../lib/ui/editstage.ui.class.php';
 
 $stage = zendata('stage');
 $stage->id->range('1-12');
diff --git a/module/stakeholder/test/lib/batchcreatestakeholder.ui.class.php b/module/stakeholder/test/lib/ui/batchcreatestakeholder.ui.class.php
similarity index 98%
rename from module/stakeholder/test/lib/batchcreatestakeholder.ui.class.php
rename to module/stakeholder/test/lib/ui/batchcreatestakeholder.ui.class.php
index 838ec6a0bf..46e6605773 100644
--- a/module/stakeholder/test/lib/batchcreatestakeholder.ui.class.php
+++ b/module/stakeholder/test/lib/ui/batchcreatestakeholder.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchCreateStakeholderTester extends tester
 {
     /**
diff --git a/module/stakeholder/test/lib/browse.ui.class.php b/module/stakeholder/test/lib/ui/browse.ui.class.php
similarity index 94%
rename from module/stakeholder/test/lib/browse.ui.class.php
rename to module/stakeholder/test/lib/ui/browse.ui.class.php
index c842159b1d..be67bdedf3 100755
--- a/module/stakeholder/test/lib/browse.ui.class.php
+++ b/module/stakeholder/test/lib/ui/browse.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTester extends tester
 {
     /**
diff --git a/module/stakeholder/test/lib/communicate.ui.class.php b/module/stakeholder/test/lib/ui/communicate.ui.class.php
similarity index 96%
rename from module/stakeholder/test/lib/communicate.ui.class.php
rename to module/stakeholder/test/lib/ui/communicate.ui.class.php
index 6bcc1ec0cc..39459a3b6f 100755
--- a/module/stakeholder/test/lib/communicate.ui.class.php
+++ b/module/stakeholder/test/lib/ui/communicate.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class communicateTester extends tester
 {
     /**
diff --git a/module/stakeholder/test/lib/createstakeholder.ui.class.php b/module/stakeholder/test/lib/ui/createstakeholder.ui.class.php
similarity index 97%
rename from module/stakeholder/test/lib/createstakeholder.ui.class.php
rename to module/stakeholder/test/lib/ui/createstakeholder.ui.class.php
index 6fb7f7967d..6536513fc8 100644
--- a/module/stakeholder/test/lib/createstakeholder.ui.class.php
+++ b/module/stakeholder/test/lib/ui/createstakeholder.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createStakeholderTester extends tester
 {
     /**
diff --git a/module/stakeholder/test/lib/editstakeholder.ui.class.php b/module/stakeholder/test/lib/ui/editstakeholder.ui.class.php
similarity index 97%
rename from module/stakeholder/test/lib/editstakeholder.ui.class.php
rename to module/stakeholder/test/lib/ui/editstakeholder.ui.class.php
index ef696b649c..c2d440ca05 100644
--- a/module/stakeholder/test/lib/editstakeholder.ui.class.php
+++ b/module/stakeholder/test/lib/ui/editstakeholder.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editStakeholderTester extends tester
 {
     /**
diff --git a/module/stakeholder/test/lib/expect.ui.class.php b/module/stakeholder/test/lib/ui/expect.ui.class.php
similarity index 98%
rename from module/stakeholder/test/lib/expect.ui.class.php
rename to module/stakeholder/test/lib/ui/expect.ui.class.php
index d8644f49b4..f32b5d72ad 100755
--- a/module/stakeholder/test/lib/expect.ui.class.php
+++ b/module/stakeholder/test/lib/ui/expect.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class expectTester extends tester
 {
     /**
diff --git a/module/stakeholder/test/lib/view.ui.class.php b/module/stakeholder/test/lib/ui/view.ui.class.php
similarity index 94%
rename from module/stakeholder/test/lib/view.ui.class.php
rename to module/stakeholder/test/lib/ui/view.ui.class.php
index d3565d7a88..69d8d2522a 100755
--- a/module/stakeholder/test/lib/view.ui.class.php
+++ b/module/stakeholder/test/lib/ui/view.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewTester extends tester
 {
     /**
diff --git a/module/stakeholder/test/ui/batchcreatestakeholder.php b/module/stakeholder/test/ui/batchcreatestakeholder.php
index d5486afde3..459415afe0 100755
--- a/module/stakeholder/test/ui/batchcreatestakeholder.php
+++ b/module/stakeholder/test/ui/batchcreatestakeholder.php
@@ -20,7 +20,7 @@ cid=2
 */
 
 chdir(__DIR__);
-include '../lib/batchcreatestakeholder.ui.class.php';
+include '../lib/ui/batchcreatestakeholder.ui.class.php';
 global $config;
 
 $stakeholder = zenData('stakeholder');
diff --git a/module/stakeholder/test/ui/browse.php b/module/stakeholder/test/ui/browse.php
index ea41ea871a..2b43cdeabc 100755
--- a/module/stakeholder/test/ui/browse.php
+++ b/module/stakeholder/test/ui/browse.php
@@ -14,7 +14,7 @@ cid=6
 */
 
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 global $config;
 
 $action = zenData('action');
diff --git a/module/stakeholder/test/ui/communicate.php b/module/stakeholder/test/ui/communicate.php
index fbe740d7bc..411d1b43a9 100755
--- a/module/stakeholder/test/ui/communicate.php
+++ b/module/stakeholder/test/ui/communicate.php
@@ -14,7 +14,7 @@ cid=4
 */
 
 chdir(__DIR__);
-include '../lib/communicate.ui.class.php';
+include '../lib/ui/communicate.ui.class.php';
 global $config;
 
 $action = zenData('action');
diff --git a/module/stakeholder/test/ui/createstakeholder.php b/module/stakeholder/test/ui/createstakeholder.php
index f782437521..59fb01c0a8 100755
--- a/module/stakeholder/test/ui/createstakeholder.php
+++ b/module/stakeholder/test/ui/createstakeholder.php
@@ -26,7 +26,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/createstakeholder.ui.class.php';
+include '../lib/ui/createstakeholder.ui.class.php';
 global $config;
 
 $stakeholder = zenData('stakeholder');
diff --git a/module/stakeholder/test/ui/editstakeholder.php b/module/stakeholder/test/ui/editstakeholder.php
index 6f7c7385e6..75c479a195 100755
--- a/module/stakeholder/test/ui/editstakeholder.php
+++ b/module/stakeholder/test/ui/editstakeholder.php
@@ -14,7 +14,7 @@ cid=3
 */
 
 chdir(__DIR__);
-include '../lib/editstakeholder.ui.class.php';
+include '../lib/ui/editstakeholder.ui.class.php';
 global $config;
 
 $stakeholder = zenData('stakeholder');
diff --git a/module/stakeholder/test/ui/expect.php b/module/stakeholder/test/ui/expect.php
index b02d90fa57..48ad01c90e 100755
--- a/module/stakeholder/test/ui/expect.php
+++ b/module/stakeholder/test/ui/expect.php
@@ -20,7 +20,7 @@ cid=5
 */
 
 chdir(__DIR__);
-include '../lib/expect.ui.class.php';
+include '../lib/ui/expect.ui.class.php';
 global $config;
 
 $action = zenData('action');
diff --git a/module/stakeholder/test/ui/view.php b/module/stakeholder/test/ui/view.php
index a95673461e..b98c2ecbbb 100755
--- a/module/stakeholder/test/ui/view.php
+++ b/module/stakeholder/test/ui/view.php
@@ -14,7 +14,7 @@ cid=7
 */
 
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 global $config;
 
 $stakeholder = zenData('stakeholder');
diff --git a/module/story/test/lib/activatestory.ui.class.php b/module/story/test/lib/ui/activatestory.ui.class.php
similarity index 96%
rename from module/story/test/lib/activatestory.ui.class.php
rename to module/story/test/lib/ui/activatestory.ui.class.php
index 5d13f8b2cc..e29caef9cd 100644
--- a/module/story/test/lib/activatestory.ui.class.php
+++ b/module/story/test/lib/ui/activatestory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 /**
     * The control file of example module of ZenTaoPMS.
     *
diff --git a/module/story/test/lib/assigntostory.ui.class.php b/module/story/test/lib/ui/assigntostory.ui.class.php
similarity index 98%
rename from module/story/test/lib/assigntostory.ui.class.php
rename to module/story/test/lib/ui/assigntostory.ui.class.php
index 2daef2757c..a3f22af6e3 100644
--- a/module/story/test/lib/assigntostory.ui.class.php
+++ b/module/story/test/lib/ui/assigntostory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 /**
     * The control file of example module of ZenTaoPMS.
     *
diff --git a/module/projectstory/test/lib/batchcreateinlite.ui.class.php b/module/story/test/lib/ui/batchcreateinlite.ui.class.php
similarity index 98%
rename from module/projectstory/test/lib/batchcreateinlite.ui.class.php
rename to module/story/test/lib/ui/batchcreateinlite.ui.class.php
index 638022dc88..74ee003455 100755
--- a/module/projectstory/test/lib/batchcreateinlite.ui.class.php
+++ b/module/story/test/lib/ui/batchcreateinlite.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchCreateStory extends tester
 {
     /**
diff --git a/module/story/test/lib/changestory.ui.class.php b/module/story/test/lib/ui/changestory.ui.class.php
similarity index 99%
rename from module/story/test/lib/changestory.ui.class.php
rename to module/story/test/lib/ui/changestory.ui.class.php
index c90d8f4bf1..57e58f645e 100755
--- a/module/story/test/lib/changestory.ui.class.php
+++ b/module/story/test/lib/ui/changestory.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class changeStoryTester extends tester
 {
     /**
diff --git a/module/story/test/lib/changestoryinlite.ui.class.php b/module/story/test/lib/ui/changestoryinlite.ui.class.php
similarity index 98%
rename from module/story/test/lib/changestoryinlite.ui.class.php
rename to module/story/test/lib/ui/changestoryinlite.ui.class.php
index 8c9723c868..d9aa6bd480 100755
--- a/module/story/test/lib/changestoryinlite.ui.class.php
+++ b/module/story/test/lib/ui/changestoryinlite.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class changeStoryInLiteTester extends tester
 {
     /**
diff --git a/module/story/test/lib/closestory.ui.class.php b/module/story/test/lib/ui/closestory.ui.class.php
similarity index 98%
rename from module/story/test/lib/closestory.ui.class.php
rename to module/story/test/lib/ui/closestory.ui.class.php
index 162a962955..95972a6d12 100644
--- a/module/story/test/lib/closestory.ui.class.php
+++ b/module/story/test/lib/ui/closestory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 /**
     * The control file of example module of ZenTaoPMS.
     *
diff --git a/module/story/test/lib/createstory.ui.class.php b/module/story/test/lib/ui/createstory.ui.class.php
similarity index 99%
rename from module/story/test/lib/createstory.ui.class.php
rename to module/story/test/lib/ui/createstory.ui.class.php
index b5f8c15024..9327d838a5 100755
--- a/module/story/test/lib/createstory.ui.class.php
+++ b/module/story/test/lib/ui/createstory.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class createStoryTester extends tester
 {
     /**
diff --git a/module/projectstory/test/lib/createstoryinlite.ui.class.php b/module/story/test/lib/ui/createstoryinlite.ui.class.php
similarity index 98%
rename from module/projectstory/test/lib/createstoryinlite.ui.class.php
rename to module/story/test/lib/ui/createstoryinlite.ui.class.php
index 551d4469be..55ab47ad58 100755
--- a/module/projectstory/test/lib/createstoryinlite.ui.class.php
+++ b/module/story/test/lib/ui/createstoryinlite.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class createStoryInLiteTester extends tester
 {
     /**
diff --git a/module/story/test/lib/editstory.ui.class.php b/module/story/test/lib/ui/editstory.ui.class.php
similarity index 98%
rename from module/story/test/lib/editstory.ui.class.php
rename to module/story/test/lib/ui/editstory.ui.class.php
index c6885ad4b5..ce0ff52622 100755
--- a/module/story/test/lib/editstory.ui.class.php
+++ b/module/story/test/lib/ui/editstory.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
  */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class editStoryTester extends tester
 {
     /**
diff --git a/module/story/test/lib/linkstory.ui.class.php b/module/story/test/lib/ui/linkstory.ui.class.php
similarity index 96%
rename from module/story/test/lib/linkstory.ui.class.php
rename to module/story/test/lib/ui/linkstory.ui.class.php
index 24880b354b..2b3810d7c3 100644
--- a/module/story/test/lib/linkstory.ui.class.php
+++ b/module/story/test/lib/ui/linkstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 /**
  *@copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
  *@license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
diff --git a/module/story/test/lib/processstorychange.ui.class.php b/module/story/test/lib/ui/processstorychange.ui.class.php
similarity index 97%
rename from module/story/test/lib/processstorychange.ui.class.php
rename to module/story/test/lib/ui/processstorychange.ui.class.php
index 6f78a2a635..5e26540c13 100644
--- a/module/story/test/lib/processstorychange.ui.class.php
+++ b/module/story/test/lib/ui/processstorychange.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 /**
  *@copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
  *@license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
diff --git a/module/story/test/lib/reviewstory.ui.class.php b/module/story/test/lib/ui/reviewstory.ui.class.php
similarity index 97%
rename from module/story/test/lib/reviewstory.ui.class.php
rename to module/story/test/lib/ui/reviewstory.ui.class.php
index 0fdc1944e9..2dbe12d8ac 100644
--- a/module/story/test/lib/reviewstory.ui.class.php
+++ b/module/story/test/lib/ui/reviewstory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 /**
     * The control file of example module of ZenTaoPMS.
     *
diff --git a/module/story/test/lib/storyview.ui.class.php b/module/story/test/lib/ui/storyview.ui.class.php
similarity index 96%
rename from module/story/test/lib/storyview.ui.class.php
rename to module/story/test/lib/ui/storyview.ui.class.php
index 9a484acebe..ce168032a5 100644
--- a/module/story/test/lib/storyview.ui.class.php
+++ b/module/story/test/lib/ui/storyview.ui.class.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * @package     story
  * @link        http://www.zentao.net
 */
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class viewTester extends tester
 {
    /**
diff --git a/module/story/test/ui/activatestory.php b/module/story/test/ui/activatestory.php
index 556fa1ad53..314081a087 100755
--- a/module/story/test/ui/activatestory.php
+++ b/module/story/test/ui/activatestory.php
@@ -10,7 +10,7 @@ cid=89
 
 */
 chdir (__DIR__);
-include '../lib/activatestory.ui.class.php';
+include '../lib/ui/activatestory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/assigntostory.php b/module/story/test/ui/assigntostory.php
index 210edacb55..0b7e51f378 100755
--- a/module/story/test/ui/assigntostory.php
+++ b/module/story/test/ui/assigntostory.php
@@ -10,7 +10,7 @@ cid=89
 
 */
 chdir (__DIR__);
-include '../lib/assigntostory.ui.class.php';
+include '../lib/ui/assigntostory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/batchcreateinlite.php b/module/story/test/ui/batchcreateinlite.php
index f2a9940fc5..b667628c35 100755
--- a/module/story/test/ui/batchcreateinlite.php
+++ b/module/story/test/ui/batchcreateinlite.php
@@ -18,7 +18,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/batchcreateinlite.ui.class.php';
+include '../lib/ui/batchcreateinlite.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1');
diff --git a/module/story/test/ui/changestory.php b/module/story/test/ui/changestory.php
index b72f4b89ce..8d7ec422d0 100755
--- a/module/story/test/ui/changestory.php
+++ b/module/story/test/ui/changestory.php
@@ -10,7 +10,7 @@ cid=80
 
 */
 chdir(__DIR__);
-include '../lib/changestory.ui.class.php';
+include '../lib/ui/changestory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/changestoryinlite.php b/module/story/test/ui/changestoryinlite.php
index 6bad1cf1ba..6b412d71ed 100755
--- a/module/story/test/ui/changestoryinlite.php
+++ b/module/story/test/ui/changestoryinlite.php
@@ -9,7 +9,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/changestoryinlite.ui.class.php';
+include '../lib/ui/changestoryinlite.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/closestory.php b/module/story/test/ui/closestory.php
index 453e148fbe..41b7b28286 100755
--- a/module/story/test/ui/closestory.php
+++ b/module/story/test/ui/closestory.php
@@ -8,7 +8,7 @@ timeout=0
 cid=88
 */
 chdir (__DIR__);
-include '../lib/closestory.ui.class.php';
+include '../lib/ui/closestory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/creatstory.php b/module/story/test/ui/creatstory.php
index 22d6467665..a76088bb52 100755
--- a/module/story/test/ui/creatstory.php
+++ b/module/story/test/ui/creatstory.php
@@ -10,7 +10,7 @@ cid=80
 
 */
 chdir(__DIR__);
-include '../lib/createstory.ui.class.php';
+include '../lib/ui/createstory.ui.class.php';
 include 'page/create.php';
 include 'page/batchcreate.php';
 
diff --git a/module/story/test/ui/creatstoryinlite.php b/module/story/test/ui/creatstoryinlite.php
index a7aec50c9a..f573d3ef35 100755
--- a/module/story/test/ui/creatstoryinlite.php
+++ b/module/story/test/ui/creatstoryinlite.php
@@ -9,7 +9,7 @@ timeout=0
 
 */
 chdir(__DIR__);
-include '../lib/createstoryinlite.ui.class.php';
+include '../lib/ui/createstoryinlite.ui.class.php';
 include 'page/create.php';
 
 $product = zenData('product');
diff --git a/module/story/test/ui/editstory.php b/module/story/test/ui/editstory.php
index a28f4fc513..baa63275aa 100755
--- a/module/story/test/ui/editstory.php
+++ b/module/story/test/ui/editstory.php
@@ -10,7 +10,7 @@ cid=80
 
 */
 chdir(__DIR__);
-include '../lib/editstory.ui.class.php';
+include '../lib/ui/editstory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/linkstory.php b/module/story/test/ui/linkstory.php
index cac272cac9..9e360143b3 100755
--- a/module/story/test/ui/linkstory.php
+++ b/module/story/test/ui/linkstory.php
@@ -10,7 +10,7 @@ cid=83
 
 */
 chdir(__DIR__);
-include '../lib/linkstory.ui.class.php';
+include '../lib/ui/linkstory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/processstorychange.php b/module/story/test/ui/processstorychange.php
index f7392ea7e4..6a43fefbad 100755
--- a/module/story/test/ui/processstorychange.php
+++ b/module/story/test/ui/processstorychange.php
@@ -9,7 +9,7 @@ timeout=0
 cid=83
 */
 chdir (__DIR__);
-include '../lib/processstorychange.ui.class.php';
+include '../lib/ui/processstorychange.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/reviewstory.php b/module/story/test/ui/reviewstory.php
index 2aaf6112da..d8d2ca1355 100755
--- a/module/story/test/ui/reviewstory.php
+++ b/module/story/test/ui/reviewstory.php
@@ -10,7 +10,7 @@ cid=89
 
 */
 chdir (__DIR__);
-include '../lib/reviewstory.ui.class.php';
+include '../lib/ui/reviewstory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/storyview.php b/module/story/test/ui/storyview.php
index 088f5132e4..2cad8b286f 100755
--- a/module/story/test/ui/storyview.php
+++ b/module/story/test/ui/storyview.php
@@ -10,7 +10,7 @@ cid=90
 
 */
 chdir (__DIR__);
-include '../lib/storyview.ui.class.php';
+include '../lib/ui/storyview.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/story/test/ui/submitreview.php b/module/story/test/ui/submitreview.php
index 47864a7944..de0f3f7b98 100755
--- a/module/story/test/ui/submitreview.php
+++ b/module/story/test/ui/submitreview.php
@@ -13,7 +13,7 @@ cid=82
 
 */
 chdir (__DIR__);
-include '../lib/reviewstory.ui.class.php';
+include '../lib/ui/reviewstory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/task/test/lib/activatetask.ui.class.php b/module/task/test/lib/ui/activatetask.ui.class.php
similarity index 97%
rename from module/task/test/lib/activatetask.ui.class.php
rename to module/task/test/lib/ui/activatetask.ui.class.php
index 2d86137dc3..6b411651d7 100644
--- a/module/task/test/lib/activatetask.ui.class.php
+++ b/module/task/test/lib/ui/activatetask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class activateTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/assignto.ui.class.php b/module/task/test/lib/ui/assignto.ui.class.php
similarity index 98%
rename from module/task/test/lib/assignto.ui.class.php
rename to module/task/test/lib/ui/assignto.ui.class.php
index 3ffb8da0e3..4afd28a5f6 100644
--- a/module/task/test/lib/assignto.ui.class.php
+++ b/module/task/test/lib/ui/assignto.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class assignToTester extends tester
 {
     /**
diff --git a/module/task/test/lib/batchcreatetask.ui.class.php b/module/task/test/lib/ui/batchcreatetask.ui.class.php
similarity index 95%
rename from module/task/test/lib/batchcreatetask.ui.class.php
rename to module/task/test/lib/ui/batchcreatetask.ui.class.php
index d2c085138e..e423b702a9 100644
--- a/module/task/test/lib/batchcreatetask.ui.class.php
+++ b/module/task/test/lib/ui/batchcreatetask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchCreateTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/canceltask.ui.class.php b/module/task/test/lib/ui/canceltask.ui.class.php
similarity index 95%
rename from module/task/test/lib/canceltask.ui.class.php
rename to module/task/test/lib/ui/canceltask.ui.class.php
index 1403229d4e..d1000abaad 100644
--- a/module/task/test/lib/canceltask.ui.class.php
+++ b/module/task/test/lib/ui/canceltask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class cancelTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/closetask.ui.class.php b/module/task/test/lib/ui/closetask.ui.class.php
similarity index 95%
rename from module/task/test/lib/closetask.ui.class.php
rename to module/task/test/lib/ui/closetask.ui.class.php
index de2a2fec4e..c2080c0c3a 100644
--- a/module/task/test/lib/closetask.ui.class.php
+++ b/module/task/test/lib/ui/closetask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class closeTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/createtask.ui.class.php b/module/task/test/lib/ui/createtask.ui.class.php
similarity index 99%
rename from module/task/test/lib/createtask.ui.class.php
rename to module/task/test/lib/ui/createtask.ui.class.php
index f690b2dc78..c71873e661 100644
--- a/module/task/test/lib/createtask.ui.class.php
+++ b/module/task/test/lib/ui/createtask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/edittask.ui.class.php b/module/task/test/lib/ui/edittask.ui.class.php
similarity index 95%
rename from module/task/test/lib/edittask.ui.class.php
rename to module/task/test/lib/ui/edittask.ui.class.php
index de07ccf191..1d8146029c 100644
--- a/module/task/test/lib/edittask.ui.class.php
+++ b/module/task/test/lib/ui/edittask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/finishtask.ui.class.php b/module/task/test/lib/ui/finishtask.ui.class.php
similarity index 98%
rename from module/task/test/lib/finishtask.ui.class.php
rename to module/task/test/lib/ui/finishtask.ui.class.php
index 042a721825..58a3e4b59e 100644
--- a/module/task/test/lib/finishtask.ui.class.php
+++ b/module/task/test/lib/ui/finishtask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class finishTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/pausetask.ui.class.php b/module/task/test/lib/ui/pausetask.ui.class.php
similarity index 95%
rename from module/task/test/lib/pausetask.ui.class.php
rename to module/task/test/lib/ui/pausetask.ui.class.php
index 8df7bb31dd..8cebc81ec3 100644
--- a/module/task/test/lib/pausetask.ui.class.php
+++ b/module/task/test/lib/ui/pausetask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class pauseTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/restarttask.ui.class.php b/module/task/test/lib/ui/restarttask.ui.class.php
similarity index 98%
rename from module/task/test/lib/restarttask.ui.class.php
rename to module/task/test/lib/ui/restarttask.ui.class.php
index 1917edc774..dbdec5ddfa 100644
--- a/module/task/test/lib/restarttask.ui.class.php
+++ b/module/task/test/lib/ui/restarttask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class restartTaskTester extends tester
 {
     /**
diff --git a/module/task/test/lib/starttask.ui.class.php b/module/task/test/lib/ui/starttask.ui.class.php
similarity index 98%
rename from module/task/test/lib/starttask.ui.class.php
rename to module/task/test/lib/ui/starttask.ui.class.php
index ceb90f7e94..137cdb235d 100644
--- a/module/task/test/lib/starttask.ui.class.php
+++ b/module/task/test/lib/ui/starttask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class startTaskTester extends tester
 {
     /**
diff --git a/module/task/test/ui/activatetask.php b/module/task/test/ui/activatetask.php
index 9a13b5ee96..946c3668bc 100644
--- a/module/task/test/ui/activatetask.php
+++ b/module/task/test/ui/activatetask.php
@@ -35,7 +35,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/activatetask.ui.class.php';
+include '../lib/ui/activatetask.ui.class.php';
 
 $user = zenData('user');
 $user->id->range('1-3');
diff --git a/module/task/test/ui/assignto.php b/module/task/test/ui/assignto.php
index deea88e76b..cfd79e10e1 100644
--- a/module/task/test/ui/assignto.php
+++ b/module/task/test/ui/assignto.php
@@ -38,7 +38,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/assignto.ui.class.php';
+include '../lib/ui/assignto.ui.class.php';
 
 $user = zenData('user');
 $user->id->range('1-3');
diff --git a/module/task/test/ui/batchcreatetask.php b/module/task/test/ui/batchcreatetask.php
index 569ec7e30e..c90a1564f6 100755
--- a/module/task/test/ui/batchcreatetask.php
+++ b/module/task/test/ui/batchcreatetask.php
@@ -14,7 +14,7 @@ cid=1
 
 */
 chdir(__DIR__);
-include '../lib/batchcreatetask.ui.class.php';
+include '../lib/ui/batchcreatetask.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/task/test/ui/canceltask.php b/module/task/test/ui/canceltask.php
index 730f9d13c9..9cd395721d 100644
--- a/module/task/test/ui/canceltask.php
+++ b/module/task/test/ui/canceltask.php
@@ -29,7 +29,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/canceltask.ui.class.php';
+include '../lib/ui/canceltask.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/task/test/ui/closetask.php b/module/task/test/ui/closetask.php
index e080ae4062..09dcfd68e7 100644
--- a/module/task/test/ui/closetask.php
+++ b/module/task/test/ui/closetask.php
@@ -29,7 +29,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/closetask.ui.class.php';
+include '../lib/ui/closetask.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/task/test/ui/createtask.php b/module/task/test/ui/createtask.php
index 31f81c4b93..f72c4c4b1a 100755
--- a/module/task/test/ui/createtask.php
+++ b/module/task/test/ui/createtask.php
@@ -24,7 +24,7 @@ cid=1
 
 */
 chdir(__DIR__);
-include '../lib/createtask.ui.class.php';
+include '../lib/ui/createtask.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/task/test/ui/edittask.php b/module/task/test/ui/edittask.php
index 45eb842aba..f618b8b031 100755
--- a/module/task/test/ui/edittask.php
+++ b/module/task/test/ui/edittask.php
@@ -14,7 +14,7 @@ cid=1
 
 */
 chdir(__DIR__);
-include '../lib/edittask.ui.class.php';
+include '../lib/ui/edittask.ui.class.php';
 global $config;
 
 $user = zenData('user');
diff --git a/module/task/test/ui/finish.php b/module/task/test/ui/finish.php
index 8926530873..a46406c0e9 100644
--- a/module/task/test/ui/finish.php
+++ b/module/task/test/ui/finish.php
@@ -38,7 +38,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/finishtask.ui.class.php';
+include '../lib/ui/finishtask.ui.class.php';
 
 $user = zenData('user');
 $user->id->range('1-3');
diff --git a/module/task/test/ui/pausetask.php b/module/task/test/ui/pausetask.php
index b12536fd95..c184ab0602 100644
--- a/module/task/test/ui/pausetask.php
+++ b/module/task/test/ui/pausetask.php
@@ -29,7 +29,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/pausetask.ui.class.php';
+include '../lib/ui/pausetask.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/task/test/ui/restarttask.php b/module/task/test/ui/restarttask.php
index 7436f3a076..c499d7a595 100644
--- a/module/task/test/ui/restarttask.php
+++ b/module/task/test/ui/restarttask.php
@@ -41,7 +41,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/restarttask.ui.class.php';
+include '../lib/ui/restarttask.ui.class.php';
 
 $user = zenData('user');
 $user->id->range('1-3');
diff --git a/module/task/test/ui/starttask.php b/module/task/test/ui/starttask.php
index f0f19a6e91..d7dd5e222f 100644
--- a/module/task/test/ui/starttask.php
+++ b/module/task/test/ui/starttask.php
@@ -26,7 +26,7 @@ cid=1
 */
 
 chdir(__DIR__);
-include '../lib/starttask.ui.class.php';
+include '../lib/ui/starttask.ui.class.php';
 
 $user = zenData('user');
 $user->id->range('1-3');
diff --git a/module/testcase/test/lib/createscene.ui.class.php b/module/testcase/test/lib/ui/createscene.ui.class.php
similarity index 98%
rename from module/testcase/test/lib/createscene.ui.class.php
rename to module/testcase/test/lib/ui/createscene.ui.class.php
index 34ad029891..c70582b4eb 100644
--- a/module/testcase/test/lib/createscene.ui.class.php
+++ b/module/testcase/test/lib/ui/createscene.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createSceneTester extends tester
 {
     /**
diff --git a/module/testcase/test/lib/editscene.ui.class.php b/module/testcase/test/lib/ui/editscene.ui.class.php
similarity index 97%
rename from module/testcase/test/lib/editscene.ui.class.php
rename to module/testcase/test/lib/ui/editscene.ui.class.php
index b0834221f4..0aefad0b6c 100755
--- a/module/testcase/test/lib/editscene.ui.class.php
+++ b/module/testcase/test/lib/ui/editscene.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editSceneTester extends tester
 {
     /**
diff --git a/module/testcase/test/lib/testcase.ui.class.php b/module/testcase/test/lib/ui/testcase.ui.class.php
similarity index 99%
rename from module/testcase/test/lib/testcase.ui.class.php
rename to module/testcase/test/lib/ui/testcase.ui.class.php
index 89144a7a55..b7947fe273 100755
--- a/module/testcase/test/lib/testcase.ui.class.php
+++ b/module/testcase/test/lib/ui/testcase.ui.class.php
@@ -1,7 +1,7 @@
 <?php
 use Facebook\WebDriver\WebDriverBy;
 
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class testcase extends tester
 {
 	/**
diff --git a/module/testcase/test/ui/automation.php b/module/testcase/test/ui/automation.php
index c9c636b650..81ec634a79 100755
--- a/module/testcase/test/ui/automation.php
+++ b/module/testcase/test/ui/automation.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 $product = zenData('product');
 $product->id->range('1');
 $product->program->range('0');
diff --git a/module/testcase/test/ui/batchcreatetestcase.php b/module/testcase/test/ui/batchcreatetestcase.php
index 3d0ddd8f09..d1d62aa78c 100755
--- a/module/testcase/test/ui/batchcreatetestcase.php
+++ b/module/testcase/test/ui/batchcreatetestcase.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 zenData('product')->loadYaml('product')->gen(1);
 $tester = new testcase();
 
diff --git a/module/testcase/test/ui/batchedittestcase.php b/module/testcase/test/ui/batchedittestcase.php
index 08f2d8c581..57054a1322 100755
--- a/module/testcase/test/ui/batchedittestcase.php
+++ b/module/testcase/test/ui/batchedittestcase.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 $product = zenData('product');
 $product->id->range('1');
 $product->program->range('0');
diff --git a/module/testcase/test/ui/createscene.php b/module/testcase/test/ui/createscene.php
index 809972a528..194c4f0c1e 100755
--- a/module/testcase/test/ui/createscene.php
+++ b/module/testcase/test/ui/createscene.php
@@ -22,7 +22,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/createscene.ui.class.php';
+include '../lib/ui/createscene.ui.class.php';
 
 $module = zenData('module');
 $module->gen(0);
diff --git a/module/testcase/test/ui/createtestcase.php b/module/testcase/test/ui/createtestcase.php
index 919ce2197d..06ccba5c2b 100755
--- a/module/testcase/test/ui/createtestcase.php
+++ b/module/testcase/test/ui/createtestcase.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 zenData('product')->loadYaml('product')->gen(1);
 $tester = new testcase();
 
diff --git a/module/testcase/test/ui/editscene.php b/module/testcase/test/ui/editscene.php
index 5abd7835a3..05a090d68a 100755
--- a/module/testcase/test/ui/editscene.php
+++ b/module/testcase/test/ui/editscene.php
@@ -19,7 +19,7 @@ cid=73
 
 */
 chdir(__DIR__);
-include '../lib/editscene.ui.class.php';
+include '../lib/ui/editscene.ui.class.php';
 
 $module = zenData('module');
 $module->gen(0);
diff --git a/module/testcase/test/ui/edittestcase.php b/module/testcase/test/ui/edittestcase.php
index f82f0ebf76..c6332cb214 100755
--- a/module/testcase/test/ui/edittestcase.php
+++ b/module/testcase/test/ui/edittestcase.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 $product = zenData('product');
 $product->id->range('1');
 $product->program->range('0');
diff --git a/module/testcase/test/ui/exporttestcase.php b/module/testcase/test/ui/exporttestcase.php
index 14d8e9a053..13b465c227 100755
--- a/module/testcase/test/ui/exporttestcase.php
+++ b/module/testcase/test/ui/exporttestcase.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 $product = zenData('product');
 $product->id->range('1');
 $product->program->range('0');
diff --git a/module/testcase/test/ui/testcasebrowse.php b/module/testcase/test/ui/testcasebrowse.php
index 39d2d6ffbc..eeb4ea1fe6 100755
--- a/module/testcase/test/ui/testcasebrowse.php
+++ b/module/testcase/test/ui/testcasebrowse.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 $data1 = zenData('product')->loadYaml('product')->gen(1);
 $data2 = zenData('case')->loadYaml('case')->gen(1);
 $tester = new testcase();
diff --git a/module/testcase/test/ui/testcasereview.php b/module/testcase/test/ui/testcasereview.php
index 77341fb335..3a693c91ac 100755
--- a/module/testcase/test/ui/testcasereview.php
+++ b/module/testcase/test/ui/testcasereview.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 zenData('product')->loadYaml('product')->gen(1);
 $story = zenData('story');
 $story->id->setFields(array(array('range' => '2')));
diff --git a/module/testcase/test/ui/testcaseview.php b/module/testcase/test/ui/testcaseview.php
index 5bc56a495a..bb60fcdc40 100755
--- a/module/testcase/test/ui/testcaseview.php
+++ b/module/testcase/test/ui/testcaseview.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 zenData('product')->loadYaml('product')->gen(1);
 zenData('case')->loadYaml('case')->gen(1);
 $tester = new testcase();
diff --git a/module/testcase/test/ui/zerocase.php b/module/testcase/test/ui/zerocase.php
index 94abec8e19..cd71fee9af 100755
--- a/module/testcase/test/ui/zerocase.php
+++ b/module/testcase/test/ui/zerocase.php
@@ -13,7 +13,7 @@ cid=1
  - 最终测试状态 @SUCCESS
 
 */
-include '../lib/testcase.ui.class.php';
+include '../lib/ui/testcase.ui.class.php';
 $product = zenData('product');
 $product->id->range('1');
 $product->program->range('0');
diff --git a/module/testsuite/test/lib/browse.ui.class.php b/module/testsuite/test/lib/ui/browse.ui.class.php
similarity index 94%
rename from module/testsuite/test/lib/browse.ui.class.php
rename to module/testsuite/test/lib/ui/browse.ui.class.php
index 6e4181f04a..198efe305b 100644
--- a/module/testsuite/test/lib/browse.ui.class.php
+++ b/module/testsuite/test/lib/ui/browse.ui.class.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class browseTestSuiteTester extends tester
 {
     /*
diff --git a/module/testsuite/test/lib/create.ui.class.php b/module/testsuite/test/lib/ui/create.ui.class.php
similarity index 96%
rename from module/testsuite/test/lib/create.ui.class.php
rename to module/testsuite/test/lib/ui/create.ui.class.php
index 76e73c37c6..0c7a8065ec 100644
--- a/module/testsuite/test/lib/create.ui.class.php
+++ b/module/testsuite/test/lib/ui/create.ui.class.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class createTestSuiteTester extends tester
 {
     /*
diff --git a/module/testsuite/test/lib/edit.ui.class.php b/module/testsuite/test/lib/ui/edit.ui.class.php
similarity index 93%
rename from module/testsuite/test/lib/edit.ui.class.php
rename to module/testsuite/test/lib/ui/edit.ui.class.php
index c41085ffa7..a22fa30fe0 100644
--- a/module/testsuite/test/lib/edit.ui.class.php
+++ b/module/testsuite/test/lib/ui/edit.ui.class.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class editTestSuiteTester extends tester
 {
     /*
diff --git a/module/testsuite/test/lib/view.ui.class.php b/module/testsuite/test/lib/ui/view.ui.class.php
similarity index 93%
rename from module/testsuite/test/lib/view.ui.class.php
rename to module/testsuite/test/lib/ui/view.ui.class.php
index 3d016c8874..f3dff45ede 100644
--- a/module/testsuite/test/lib/view.ui.class.php
+++ b/module/testsuite/test/lib/ui/view.ui.class.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-include dirname(__FILE__, 5).'/test/lib/ui.php';
+include dirname(__FILE__, 6).'/test/lib/ui.php';
 class viewTester extends tester
 {
     /**
diff --git a/module/testsuite/test/ui/browsetestsuite.php b/module/testsuite/test/ui/browsetestsuite.php
index 9869ca8b9d..8d43b676c7 100644
--- a/module/testsuite/test/ui/browsetestsuite.php
+++ b/module/testsuite/test/ui/browsetestsuite.php
@@ -7,7 +7,7 @@ timeout=0
 cid=72
 */
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/testsuite/test/ui/createtestsuite.php b/module/testsuite/test/ui/createtestsuite.php
index ad4d4dd650..6de8a157bb 100644
--- a/module/testsuite/test/ui/createtestsuite.php
+++ b/module/testsuite/test/ui/createtestsuite.php
@@ -7,7 +7,7 @@ timeout=0
 cid=70
 */
 chdir(__DIR__);
-include '../lib/create.ui.class.php';
+include '../lib/ui/create.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/testsuite/test/ui/edittestsuite.php b/module/testsuite/test/ui/edittestsuite.php
index 9e9dc96020..7d1657c086 100644
--- a/module/testsuite/test/ui/edittestsuite.php
+++ b/module/testsuite/test/ui/edittestsuite.php
@@ -7,7 +7,7 @@ timeout=0
 cid=71
 */
 chdir(__DIR__);
-include '../lib/edit.ui.class.php';
+include '../lib/ui/edit.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/testsuite/test/ui/viewtestsuite.php b/module/testsuite/test/ui/viewtestsuite.php
index d25efdf1f4..12de10f3d8 100644
--- a/module/testsuite/test/ui/viewtestsuite.php
+++ b/module/testsuite/test/ui/viewtestsuite.php
@@ -7,7 +7,7 @@ timeout=0
 cid=70
 */
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1');
diff --git a/module/testtask/test/lib/activate.ui.class.php b/module/testtask/test/lib/ui/activate.ui.class.php
similarity index 95%
rename from module/testtask/test/lib/activate.ui.class.php
rename to module/testtask/test/lib/ui/activate.ui.class.php
index 0115601618..fac8c10b7d 100755
--- a/module/testtask/test/lib/activate.ui.class.php
+++ b/module/testtask/test/lib/ui/activate.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class activateTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/batchrun.ui.class.php b/module/testtask/test/lib/ui/batchrun.ui.class.php
similarity index 97%
rename from module/testtask/test/lib/batchrun.ui.class.php
rename to module/testtask/test/lib/ui/batchrun.ui.class.php
index 7a2b081d03..7a919867c2 100644
--- a/module/testtask/test/lib/batchrun.ui.class.php
+++ b/module/testtask/test/lib/ui/batchrun.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchRunTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/browse.ui.class.php b/module/testtask/test/lib/ui/browse.ui.class.php
similarity index 96%
rename from module/testtask/test/lib/browse.ui.class.php
rename to module/testtask/test/lib/ui/browse.ui.class.php
index 11e2c52174..85f9842802 100644
--- a/module/testtask/test/lib/browse.ui.class.php
+++ b/module/testtask/test/lib/ui/browse.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/cases.ui.class.php b/module/testtask/test/lib/ui/cases.ui.class.php
similarity index 98%
rename from module/testtask/test/lib/cases.ui.class.php
rename to module/testtask/test/lib/ui/cases.ui.class.php
index 1a7efcca01..8385211b7e 100644
--- a/module/testtask/test/lib/cases.ui.class.php
+++ b/module/testtask/test/lib/ui/cases.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class casesTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/close.ui.class.php b/module/testtask/test/lib/ui/close.ui.class.php
similarity index 96%
rename from module/testtask/test/lib/close.ui.class.php
rename to module/testtask/test/lib/ui/close.ui.class.php
index 151f9d8131..a8f6645319 100644
--- a/module/testtask/test/lib/close.ui.class.php
+++ b/module/testtask/test/lib/ui/close.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class closeTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/create.ui.class.php b/module/testtask/test/lib/ui/create.ui.class.php
similarity index 98%
rename from module/testtask/test/lib/create.ui.class.php
rename to module/testtask/test/lib/ui/create.ui.class.php
index f9c9684411..0801069af7 100755
--- a/module/testtask/test/lib/create.ui.class.php
+++ b/module/testtask/test/lib/ui/create.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/delete.ui.class.php b/module/testtask/test/lib/ui/delete.ui.class.php
similarity index 95%
rename from module/testtask/test/lib/delete.ui.class.php
rename to module/testtask/test/lib/ui/delete.ui.class.php
index 00ad4e5888..869ded8ea7 100755
--- a/module/testtask/test/lib/delete.ui.class.php
+++ b/module/testtask/test/lib/ui/delete.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class deleteTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/edit.ui.class.php b/module/testtask/test/lib/ui/edit.ui.class.php
similarity index 98%
rename from module/testtask/test/lib/edit.ui.class.php
rename to module/testtask/test/lib/ui/edit.ui.class.php
index f731dfa928..84a2854956 100755
--- a/module/testtask/test/lib/edit.ui.class.php
+++ b/module/testtask/test/lib/ui/edit.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/groupcase.ui.class.php b/module/testtask/test/lib/ui/groupcase.ui.class.php
similarity index 93%
rename from module/testtask/test/lib/groupcase.ui.class.php
rename to module/testtask/test/lib/ui/groupcase.ui.class.php
index f47cc75471..e065b08705 100644
--- a/module/testtask/test/lib/groupcase.ui.class.php
+++ b/module/testtask/test/lib/ui/groupcase.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class groupCaseTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/linkcase.ui.class.php b/module/testtask/test/lib/ui/linkcase.ui.class.php
similarity index 95%
rename from module/testtask/test/lib/linkcase.ui.class.php
rename to module/testtask/test/lib/ui/linkcase.ui.class.php
index a9b596a7c3..8e7d2bccb7 100644
--- a/module/testtask/test/lib/linkcase.ui.class.php
+++ b/module/testtask/test/lib/ui/linkcase.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class linkCaseTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/report.ui.class.php b/module/testtask/test/lib/ui/report.ui.class.php
similarity index 98%
rename from module/testtask/test/lib/report.ui.class.php
rename to module/testtask/test/lib/ui/report.ui.class.php
index 6c55861a04..e6763fefce 100644
--- a/module/testtask/test/lib/report.ui.class.php
+++ b/module/testtask/test/lib/ui/report.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class reportTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/results.ui.class.php b/module/testtask/test/lib/ui/results.ui.class.php
similarity index 98%
rename from module/testtask/test/lib/results.ui.class.php
rename to module/testtask/test/lib/ui/results.ui.class.php
index dd9eb7e71c..b71f58cb25 100644
--- a/module/testtask/test/lib/results.ui.class.php
+++ b/module/testtask/test/lib/ui/results.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class resultsTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/runcase.ui.class.php b/module/testtask/test/lib/ui/runcase.ui.class.php
similarity index 95%
rename from module/testtask/test/lib/runcase.ui.class.php
rename to module/testtask/test/lib/ui/runcase.ui.class.php
index c0b25a36d0..9637e70882 100644
--- a/module/testtask/test/lib/runcase.ui.class.php
+++ b/module/testtask/test/lib/ui/runcase.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class runCaseTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/start.ui.class.php b/module/testtask/test/lib/ui/start.ui.class.php
similarity index 92%
rename from module/testtask/test/lib/start.ui.class.php
rename to module/testtask/test/lib/ui/start.ui.class.php
index 0d67589819..6f7b043f1b 100644
--- a/module/testtask/test/lib/start.ui.class.php
+++ b/module/testtask/test/lib/ui/start.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class startTester extends tester
 {
     /**
diff --git a/module/testtask/test/lib/view.ui.class.php b/module/testtask/test/lib/ui/view.ui.class.php
similarity index 96%
rename from module/testtask/test/lib/view.ui.class.php
rename to module/testtask/test/lib/ui/view.ui.class.php
index 00dddc1962..5ad7569a3f 100644
--- a/module/testtask/test/lib/view.ui.class.php
+++ b/module/testtask/test/lib/ui/view.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewTester extends tester
 {
     /**
diff --git a/module/testtask/test/ui/activate.php b/module/testtask/test/ui/activate.php
index b7e9075235..7345a1e3f7 100644
--- a/module/testtask/test/ui/activate.php
+++ b/module/testtask/test/ui/activate.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/activate.ui.class.php';
+include '../lib/ui/activate.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/batchrun.php b/module/testtask/test/ui/batchrun.php
index 0bd7a2b226..39f35fcb90 100755
--- a/module/testtask/test/ui/batchrun.php
+++ b/module/testtask/test/ui/batchrun.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/batchrun.ui.class.php';
+include '../lib/ui/batchrun.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/browse.php b/module/testtask/test/ui/browse.php
index 6f4793e4c4..799ad0ffa9 100755
--- a/module/testtask/test/ui/browse.php
+++ b/module/testtask/test/ui/browse.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/cases.php b/module/testtask/test/ui/cases.php
index 5a0a0f1d5f..0819f34558 100755
--- a/module/testtask/test/ui/cases.php
+++ b/module/testtask/test/ui/cases.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/cases.ui.class.php';
+include '../lib/ui/cases.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/close.php b/module/testtask/test/ui/close.php
index e355817e18..07bb762d9b 100755
--- a/module/testtask/test/ui/close.php
+++ b/module/testtask/test/ui/close.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/close.ui.class.php';
+include '../lib/ui/close.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/create.php b/module/testtask/test/ui/create.php
index 40c16ec9fc..760b118336 100755
--- a/module/testtask/test/ui/create.php
+++ b/module/testtask/test/ui/create.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/create.ui.class.php';
+include '../lib/ui/create.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/delete.php b/module/testtask/test/ui/delete.php
index f88ce2a87b..ec6dfaec82 100755
--- a/module/testtask/test/ui/delete.php
+++ b/module/testtask/test/ui/delete.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/delete.ui.class.php';
+include '../lib/ui/delete.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/edit.php b/module/testtask/test/ui/edit.php
index 98d8225741..d967e9311e 100755
--- a/module/testtask/test/ui/edit.php
+++ b/module/testtask/test/ui/edit.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/edit.ui.class.php';
+include '../lib/ui/edit.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/groupcase.php b/module/testtask/test/ui/groupcase.php
index 8b4ef16b37..350e5e9108 100644
--- a/module/testtask/test/ui/groupcase.php
+++ b/module/testtask/test/ui/groupcase.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/groupcase.ui.class.php';
+include '../lib/ui/groupcase.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/linkcase.php b/module/testtask/test/ui/linkcase.php
index c94486845c..3ee5e48ff4 100755
--- a/module/testtask/test/ui/linkcase.php
+++ b/module/testtask/test/ui/linkcase.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/linkcase.ui.class.php';
+include '../lib/ui/linkcase.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/report.php b/module/testtask/test/ui/report.php
index 155e608731..b4a725eeed 100644
--- a/module/testtask/test/ui/report.php
+++ b/module/testtask/test/ui/report.php
@@ -23,7 +23,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/report.ui.class.php';
+include '../lib/ui/report.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/results.php b/module/testtask/test/ui/results.php
index 086db1e159..bc6cc3b4c2 100644
--- a/module/testtask/test/ui/results.php
+++ b/module/testtask/test/ui/results.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/results.ui.class.php';
+include '../lib/ui/results.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/runcase.php b/module/testtask/test/ui/runcase.php
index eca9904f79..58d871902e 100755
--- a/module/testtask/test/ui/runcase.php
+++ b/module/testtask/test/ui/runcase.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/runcase.ui.class.php';
+include '../lib/ui/runcase.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/start.php b/module/testtask/test/ui/start.php
index 0da3ffd774..bdbfc15056 100755
--- a/module/testtask/test/ui/start.php
+++ b/module/testtask/test/ui/start.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/start.ui.class.php';
+include '../lib/ui/start.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/testtask/test/ui/view.php b/module/testtask/test/ui/view.php
index 74b6b00a04..6b6ca5ca96 100644
--- a/module/testtask/test/ui/view.php
+++ b/module/testtask/test/ui/view.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/view.ui.class.php';
+include '../lib/ui/view.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/tree/test/lib/browse.ui.class.php b/module/tree/test/lib/ui/browse.ui.class.php
similarity index 99%
rename from module/tree/test/lib/browse.ui.class.php
rename to module/tree/test/lib/ui/browse.ui.class.php
index e9d0251140..18352822ee 100755
--- a/module/tree/test/lib/browse.ui.class.php
+++ b/module/tree/test/lib/ui/browse.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browseTester extends tester
 {
     /**
diff --git a/module/tree/test/lib/browsetask.ui.class.php b/module/tree/test/lib/ui/browsetask.ui.class.php
similarity index 99%
rename from module/tree/test/lib/browsetask.ui.class.php
rename to module/tree/test/lib/ui/browsetask.ui.class.php
index 5583eaf012..02b59c33cd 100644
--- a/module/tree/test/lib/browsetask.ui.class.php
+++ b/module/tree/test/lib/ui/browsetask.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class browsetaskTester extends tester
 {
     /**
diff --git a/module/tree/test/lib/viewhistory.ui.class.php b/module/tree/test/lib/ui/viewhistory.ui.class.php
similarity index 95%
rename from module/tree/test/lib/viewhistory.ui.class.php
rename to module/tree/test/lib/ui/viewhistory.ui.class.php
index b099e28925..fbc4d3315b 100644
--- a/module/tree/test/lib/viewhistory.ui.class.php
+++ b/module/tree/test/lib/ui/viewhistory.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class viewhistoryTester extends tester
 {
     /**
diff --git a/module/tree/test/ui/browse.php b/module/tree/test/ui/browse.php
index 5b22a69352..55fdcd9401 100755
--- a/module/tree/test/ui/browse.php
+++ b/module/tree/test/ui/browse.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/browse.ui.class.php';
+include '../lib/ui/browse.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/tree/test/ui/browsetask.php b/module/tree/test/ui/browsetask.php
index f1d1d072b1..7d21736963 100644
--- a/module/tree/test/ui/browsetask.php
+++ b/module/tree/test/ui/browsetask.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/browsetask.ui.class.php';
+include '../lib/ui/browsetask.ui.class.php';
 
 $project = zenData('project');
 $project->id->range('1-100');
diff --git a/module/tree/test/ui/viewhistory.php b/module/tree/test/ui/viewhistory.php
index b189cebea0..a3dabb1232 100644
--- a/module/tree/test/ui/viewhistory.php
+++ b/module/tree/test/ui/viewhistory.php
@@ -8,7 +8,7 @@ cid=1
  */
 
 chdir(__DIR__);
-include '../lib/viewhistory.ui.class.php';
+include '../lib/ui/viewhistory.ui.class.php';
 
 $product = zenData('product');
 $product->id->range('1-100');
diff --git a/module/user/test/lib/batchcreateuser.ui.class.php b/module/user/test/lib/ui/batchcreateuser.ui.class.php
similarity index 98%
rename from module/user/test/lib/batchcreateuser.ui.class.php
rename to module/user/test/lib/ui/batchcreateuser.ui.class.php
index 37220a27fd..36086570bb 100755
--- a/module/user/test/lib/batchcreateuser.ui.class.php
+++ b/module/user/test/lib/ui/batchcreateuser.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchCreateUserTester extends tester
 {
     /**
diff --git a/module/user/test/lib/batchedituser.ui.class.php b/module/user/test/lib/ui/batchedituser.ui.class.php
similarity index 98%
rename from module/user/test/lib/batchedituser.ui.class.php
rename to module/user/test/lib/ui/batchedituser.ui.class.php
index a9d4862985..9ba99136ad 100755
--- a/module/user/test/lib/batchedituser.ui.class.php
+++ b/module/user/test/lib/ui/batchedituser.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class batchEditUserTester extends tester
 {
     /**
diff --git a/module/user/test/lib/createuser.ui.class.php b/module/user/test/lib/ui/createuser.ui.class.php
similarity index 98%
rename from module/user/test/lib/createuser.ui.class.php
rename to module/user/test/lib/ui/createuser.ui.class.php
index c5d87b70ad..5475f0a41f 100755
--- a/module/user/test/lib/createuser.ui.class.php
+++ b/module/user/test/lib/ui/createuser.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class createUserTester extends tester
 {
     /**
diff --git a/module/user/test/lib/edituser.ui.class.php b/module/user/test/lib/ui/edituser.ui.class.php
similarity index 93%
rename from module/user/test/lib/edituser.ui.class.php
rename to module/user/test/lib/ui/edituser.ui.class.php
index b09e702604..0353023f9e 100755
--- a/module/user/test/lib/edituser.ui.class.php
+++ b/module/user/test/lib/ui/edituser.ui.class.php
@@ -1,5 +1,5 @@
 <?php
-include dirname(__FILE__, 5) . '/test/lib/ui.php';
+include dirname(__FILE__, 6) . '/test/lib/ui.php';
 class editUserTester extends tester
 {
     /**
diff --git a/module/user/test/ui/batchcreateuser.php b/module/user/test/ui/batchcreateuser.php
index 3f47cb87cf..ae5723bb0d 100755
--- a/module/user/test/ui/batchcreateuser.php
+++ b/module/user/test/ui/batchcreateuser.php
@@ -18,7 +18,7 @@ cid=1
 
 */
 chdir(__DIR__);
-include '../lib/batchcreateuser.ui.class.php';
+include '../lib/ui/batchcreateuser.ui.class.php';
 
 zendata('user')->loadYaml('user', false, 2)->gen(10);
 $tester = new batchCreateUserTester();
diff --git a/module/user/test/ui/batchedituser.php b/module/user/test/ui/batchedituser.php
index 78f9a5f9cf..1abd493e2e 100755
--- a/module/user/test/ui/batchedituser.php
+++ b/module/user/test/ui/batchedituser.php
@@ -16,7 +16,7 @@ cid=2
 
 */
 chdir(__DIR__);
-include '../lib/batchedituser.ui.class.php';
+include '../lib/ui/batchedituser.ui.class.php';
 
 zendata('user')->loadYaml('user', false, 2)->gen(10);
 zendata('dept')->gen(0);
diff --git a/module/user/test/ui/createuser.php b/module/user/test/ui/createuser.php
index f3bd6bf055..97bf80b639 100755
--- a/module/user/test/ui/createuser.php
+++ b/module/user/test/ui/createuser.php
@@ -18,7 +18,7 @@ cid=1
 
  */
 chdir(__DIR__);
-include '../lib/createuser.ui.class.php';
+include '../lib/ui/createuser.ui.class.php';
 
 zendata('user')->loadYaml('user', false, 2)->gen(10);
 $tester = new createUserTester();
diff --git a/module/user/test/ui/edituser.php b/module/user/test/ui/edituser.php
index 5cf9ff1527..2d858ae58a 100755
--- a/module/user/test/ui/edituser.php
+++ b/module/user/test/ui/edituser.php
@@ -13,7 +13,7 @@ cid=2
 
 */
 chdir(__DIR__);
-include '../lib/edituser.ui.class.php';
+include '../lib/ui/edituser.ui.class.php';
 
 zendata('user')->loadYaml('user', false, 2)->gen(10);
 $tester = new editUserTester();