diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/developer-Test.Page.Sample.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/developer-Test.Page.Sample.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/developer-Test.Page.Sample.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/developer-Test.Page.Sample.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-HowTo.Change.Language-TESTONLY.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-HowTo.Change.Language-TESTONLY.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-HowTo.Change.Language-TESTONLY.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-HowTo.Change.Language-TESTONLY.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-HowTo.Use.FullText.Search-TESTONLY.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-HowTo.Use.FullText.Search-TESTONLY.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-HowTo.Use.FullText.Search-TESTONLY.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-HowTo.Use.FullText.Search-TESTONLY.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.A.Payment.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.A.Payment.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.A.Payment.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.A.Payment.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/1.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/1.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/1.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/1.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/10.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/10.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/10.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/10.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/11.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/11.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/11.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/11.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/12.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/12.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/12.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/12.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/13.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/13.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/13.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/13.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/14.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/14.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/14.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/14.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/2.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/2.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/2.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/2.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/3.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/3.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/3.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/3.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/4.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/4.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/4.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/4.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/5.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/5.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/5.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/5.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/6.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/6.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/6.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/6.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/7.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/7.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/7.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/7.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/8.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/8.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/8.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/8.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/9.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/9.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/9.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Bank.Account/9.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Campaigns.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Campaigns.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Campaigns.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Campaigns.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Organisations.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Organisations.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Organisations.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Organisations.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/1.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/1.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/1.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/1.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/2.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/2.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/2.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/2.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/3.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/3.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/3.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Outgoing.Events/3.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/1.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/1.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/1.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/1.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/10.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/10.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/10.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/10.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/11.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/11.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/11.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/11.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/12.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/12.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/12.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/12.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/13.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/13.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/13.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/13.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/14.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/14.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/14.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/14.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/2.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/2.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/2.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/2.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/3.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/3.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/3.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/3.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/4.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/4.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/4.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/4.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/5.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/5.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/5.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/5.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/6.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/6.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/6.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/6.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/7.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/7.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/7.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/7.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/8.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/8.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/8.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/8.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/9.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/9.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Persons/9.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Persons/9.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Sale.Orders.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Sale.Orders.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Sale.Orders.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Sale.Orders.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/1.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/1.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/1.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/1.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/2.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/2.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/2.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/2.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/3.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/3.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/3.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.Trade.Conditions/3.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.and.Manage.Products.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.and.Manage.Products.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Create.and.Manage.Products.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Create.and.Manage.Products.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Generate.Report.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Generate.Report.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Generate.Report.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Generate.Report.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Link.Persons.and.Organisations.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Link.Persons.and.Organisations.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Link.Persons.and.Organisations.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Link.Persons.and.Organisations.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/1.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/1.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/1.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/1.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/2.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/2.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/2.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/2.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/3.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/3.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/3.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Invoices/3.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Packing.Lists.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Packing.Lists.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Packing.Lists.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Packing.Lists.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Packing.Lists/1.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Packing.Lists/1.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Packing.Lists/1.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Packing.Lists/1.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/1.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/1.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/1.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/1.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/2.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/2.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/2.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/2.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/3.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/3.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/3.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/3.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/agenda_123123111_screenshot.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/agenda_123123111_screenshot.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/agenda_123123111_screenshot.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Manage.Support.Request/agenda_123123111_screenshot.xml
diff --git a/bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Post.Outgoing.Events.xml b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Post.Outgoing.Events.xml
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/PathTemplateItem/test_page_module/user-Howto.Post.Outgoing.Events.xml
rename to bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Post.Outgoing.Events.xml
diff --git a/bt5/erp5_user_tutorial/bt/change_log b/bt5/erp5_user_tutorial/bt/change_log
new file mode 100644
index 0000000000000000000000000000000000000000..a468c9945534052001406667904891253327836e
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/change_log
@@ -0,0 +1,2 @@
+30-12-2013 aurel
+- Initial release
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial/bt/comment b/bt5/erp5_user_tutorial/bt/comment
new file mode 100644
index 0000000000000000000000000000000000000000..16e2ab3fc5facf2475a9e1baa33e9d7693412c32
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/comment
@@ -0,0 +1 @@
+This bt5 contains user documentation
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial/bt/copyright_list b/bt5/erp5_user_tutorial/bt/copyright_list
new file mode 100644
index 0000000000000000000000000000000000000000..1b40bfe60cfa3938a0f4f81a99b89741c203b5ac
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/copyright_list
@@ -0,0 +1 @@
+Copyright 2013, Nexedi SA
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial/bt/dependency_list b/bt5/erp5_user_tutorial/bt/dependency_list
new file mode 100644
index 0000000000000000000000000000000000000000..eb9d4a743d007161ba22de6b095fb1506aa2e473
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/dependency_list
@@ -0,0 +1 @@
+erp5_run_my_doc
diff --git a/bt5/erp5_user_tutorial/bt/description b/bt5/erp5_user_tutorial/bt/description
new file mode 100644
index 0000000000000000000000000000000000000000..16e2ab3fc5facf2475a9e1baa33e9d7693412c32
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/description
@@ -0,0 +1 @@
+This bt5 contains user documentation
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial/bt/license b/bt5/erp5_user_tutorial/bt/license
new file mode 100644
index 0000000000000000000000000000000000000000..61e66d6f5a4897249533026ea555e790f1e17404
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/license
@@ -0,0 +1 @@
+Creative Common Attribution NonCommercial ShareAlike
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial/bt/maintainer_list b/bt5/erp5_user_tutorial/bt/maintainer_list
new file mode 100644
index 0000000000000000000000000000000000000000..024ae314798c7e8a5d5c2b15bbe68df092e6a677
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/maintainer_list
@@ -0,0 +1,2 @@
+aurel
+gabriel
diff --git a/bt5/erp5_user_tutorial/bt/publication_url b/bt5/erp5_user_tutorial/bt/publication_url
new file mode 100644
index 0000000000000000000000000000000000000000..4af18322e32f3dd19579c80e26e4a306ad11e049
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/publication_url
@@ -0,0 +1 @@
+None
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial/bt/revision b/bt5/erp5_user_tutorial/bt/revision
new file mode 100644
index 0000000000000000000000000000000000000000..56a6051ca2b02b04ef92d5150c9ef600403cb1de
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/revision
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial/bt/template_format_version b/bt5/erp5_user_tutorial/bt/template_format_version
new file mode 100644
index 0000000000000000000000000000000000000000..56a6051ca2b02b04ef92d5150c9ef600403cb1de
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/template_format_version
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial_ui_test/bt/template_keep_workflow_path_list b/bt5/erp5_user_tutorial/bt/template_keep_workflow_path_list
similarity index 100%
rename from bt5/erp5_user_tutorial_ui_test/bt/template_keep_workflow_path_list
rename to bt5/erp5_user_tutorial/bt/template_keep_workflow_path_list
diff --git a/bt5/erp5_user_tutorial/bt/template_path_list b/bt5/erp5_user_tutorial/bt/template_path_list
new file mode 100644
index 0000000000000000000000000000000000000000..65292f8f663e885c0938ab380c31abe50364873e
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/template_path_list
@@ -0,0 +1,24 @@
+test_page_module/developer-Test.Page.Sample
+test_page_module/user-HowTo.Change.Language-TESTONLY
+test_page_module/user-Howto.Create.and.Manage.Products
+test_page_module/user-Howto.Create.A.Payment
+test_page_module/user-Howto.Create.Bank.Account
+test_page_module/user-Howto.Create.Campaigns
+test_page_module/user-Howto.Create.Organisations
+test_page_module/user-Howto.Create.Outgoing.Events
+test_page_module/user-Howto.Create.Outgoing.Events/**
+test_page_module/user-Howto.Create.Persons
+test_page_module/user-Howto.Create.Persons/**
+test_page_module/user-Howto.Create.Sale.Orders
+test_page_module/user-Howto.Create.Trade.Conditions
+test_page_module/user-Howto.Create.Trade.Conditions/**
+test_page_module/user-Howto.Generate.Report
+test_page_module/user-Howto.Link.Persons.and.Organisations
+test_page_module/user-Howto.Manage.Invoices
+test_page_module/user-Howto.Manage.Invoices/**
+test_page_module/user-Howto.Manage.Packing.Lists
+test_page_module/user-Howto.Manage.Packing.Lists/**
+test_page_module/user-Howto.Manage.Support.Request
+test_page_module/user-Howto.Manage.Support.Request/**
+test_page_module/user-Howto.Post.Outgoing.Events
+test_page_module/user-HowTo.Use.FullText.Search-TESTONLY
diff --git a/bt5/erp5_user_tutorial/bt/title b/bt5/erp5_user_tutorial/bt/title
new file mode 100644
index 0000000000000000000000000000000000000000..4003ad9e562e754a93261813409d1ae66d2b3b0d
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/title
@@ -0,0 +1 @@
+erp5_user_tutorial
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial/bt/version b/bt5/erp5_user_tutorial/bt/version
new file mode 100644
index 0000000000000000000000000000000000000000..48360de846a2e022a0b981d250895f20d3480d34
--- /dev/null
+++ b/bt5/erp5_user_tutorial/bt/version
@@ -0,0 +1 @@
+5.4.7
\ No newline at end of file
diff --git a/bt5/erp5_user_tutorial_ui_test/bt/template_path_list b/bt5/erp5_user_tutorial_ui_test/bt/template_path_list
index 65292f8f663e885c0938ab380c31abe50364873e..8550adb3520aa7f55ff32fa33416c8add0ec2c2c 100644
--- a/bt5/erp5_user_tutorial_ui_test/bt/template_path_list
+++ b/bt5/erp5_user_tutorial_ui_test/bt/template_path_list
@@ -1,24 +1,32 @@
-test_page_module/developer-Test.Page.Sample
-test_page_module/user-HowTo.Change.Language-TESTONLY
-test_page_module/user-Howto.Create.and.Manage.Products
-test_page_module/user-Howto.Create.A.Payment
-test_page_module/user-Howto.Create.Bank.Account
-test_page_module/user-Howto.Create.Campaigns
-test_page_module/user-Howto.Create.Organisations
-test_page_module/user-Howto.Create.Outgoing.Events
-test_page_module/user-Howto.Create.Outgoing.Events/**
-test_page_module/user-Howto.Create.Persons
-test_page_module/user-Howto.Create.Persons/**
-test_page_module/user-Howto.Create.Sale.Orders
-test_page_module/user-Howto.Create.Trade.Conditions
-test_page_module/user-Howto.Create.Trade.Conditions/**
-test_page_module/user-Howto.Generate.Report
-test_page_module/user-Howto.Link.Persons.and.Organisations
-test_page_module/user-Howto.Manage.Invoices
-test_page_module/user-Howto.Manage.Invoices/**
-test_page_module/user-Howto.Manage.Packing.Lists
-test_page_module/user-Howto.Manage.Packing.Lists/**
-test_page_module/user-Howto.Manage.Support.Request
-test_page_module/user-Howto.Manage.Support.Request/**
-test_page_module/user-Howto.Post.Outgoing.Events
-test_page_module/user-HowTo.Use.FullText.Search-TESTONLY
+portal_categories/activity/education
+portal_categories/base_amount/taxable
+portal_categories/delivery_mode/air
+portal_categories/function/marketing
+portal_categories/function/marketing/marketing_manager
+portal_categories/function/sales
+portal_categories/function/sales/manager
+portal_categories/gender/female
+portal_categories/gender/male
+portal_categories/group/my_group
+portal_categories/incoterm/cpt
+portal_categories/marital_status/married
+portal_categories/nationality/french
+portal_categories/order/normal
+portal_categories/payment_mode/credit_card
+portal_categories/quantity_unit/time
+portal_categories/quantity_unit/time/**
+portal_categories/quantity_unit/unit
+portal_categories/quantity_unit/unit/**
+portal_categories/region/brazil
+portal_categories/role/**
+portal_categories/use/test_functional_incoming_service
+account_module/bank
+account_module/collected_vat  
+account_module/equity  
+account_module/fixed_assets  
+account_module/goods_purchase
+account_module/goods_sales
+account_module/payable
+account_module/receivable
+account_module/refundable_vat
+account_module/stocks
\ No newline at end of file
diff --git a/product/ERP5/tests/testFunctionalRunMyDocSample.py b/product/ERP5/tests/testFunctionalRunMyDocSample.py
index c33974b24a181105837e81289c95f77305491e16..57b1fc655952ebd094c1e79a4ad546e633cf8bba 100644
--- a/product/ERP5/tests/testFunctionalRunMyDocSample.py
+++ b/product/ERP5/tests/testFunctionalRunMyDocSample.py
@@ -60,7 +60,7 @@ class TestZeleniumRunMyDocSample(ERP5TypeFunctionalTestCase):
             'erp5_accounting',
             'erp5_jquery', 'erp5_dms', 'erp5_jquery_ui', 'erp5_web',
             'erp5_slideshow_style', 'erp5_knowledge_pad', 'erp5_run_my_doc',
-            'erp5_user_tutorial_ui_test')
+            'erp5_user_tutorial_ui_test', 'erp5_user_tutorial',)
 
 def test_suite():
   suite = unittest.TestSuite()
diff --git a/product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py b/product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py
index 40914ee5eec0a6c661b2ebd6109217bc04035025..0efe00fa53f4b5985b1f9f559b70a5c47d731a60 100644
--- a/product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py
+++ b/product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py
@@ -39,7 +39,7 @@ class TestZeleniumStandaloneUserTutorial(ERP5TypeFunctionalTestCase):
   def afterSetUp(self):
     url_list = []
     for x in self.portal.test_page_module.objectValues():
-      if "SMB" not in x.getId() and "developer" not in x.getId():
+      if "user" in x.getId():
         url_list.append("test_page_module/"+x.getId())
     self.remote_code_url_list = url_list
     ERP5TypeFunctionalTestCase.afterSetUp(self)
@@ -68,6 +68,7 @@ class TestZeleniumStandaloneUserTutorial(ERP5TypeFunctionalTestCase):
             'erp5_l10n_fr', 'erp5_crm',
             'erp5_run_my_doc',
             'erp5_user_tutorial_ui_test',
+            'erp5_user_tutorial',
            )
 
 def test_suite():