diff --git a/activeprocesses.php b/activeprocesses.php
index c2a227af280d7bb3a98215da3ac6fa624d91e20e..6e413928f06d33104a6c7580fbb23ba0751fc409 100644
--- a/activeprocesses.php
+++ b/activeprocesses.php
@@ -32,7 +32,7 @@ admin_externalpage_setup('tool_lifecycle_activeprocesses');
 
 $PAGE->set_url(new \moodle_url('/admin/tool/lifecycle/activeprocesses.php'));
 
-$table = new tool_lifecycle\table\active_processes_table('tool_lifecycle_active_processes');
+$table = new tool_lifecycle\local\table\active_processes_table('tool_lifecycle_active_processes');
 
 $PAGE->set_title(get_string('active_processes_list_header', 'tool_lifecycle'));
 $PAGE->set_heading(get_string('active_processes_list_header', 'tool_lifecycle'));
diff --git a/adminlib.php b/adminlib.php
index aff2d9c0e7bb6f092b9d180834150bfb045e9a45..e5992fd5b859c17a4a02d818bd8cc1a154485209 100644
--- a/adminlib.php
+++ b/adminlib.php
@@ -23,22 +23,22 @@
  */
 namespace tool_lifecycle;
 
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\form\form_workflow_instance;
-use tool_lifecycle\form\form_upload_workflow;
-use tool_lifecycle\form\form_step_instance;
-use tool_lifecycle\form\form_trigger_instance;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\form\form_workflow_instance;
+use tool_lifecycle\local\form\form_upload_workflow;
+use tool_lifecycle\local\form\form_step_instance;
+use tool_lifecycle\local\form\form_trigger_instance;
 use tool_lifecycle\local\backup\restore_lifecycle_workflow;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\table\active_manual_workflows_table;
-use tool_lifecycle\table\workflow_definition_table;
-use tool_lifecycle\table\active_automatic_workflows_table;
-use tool_lifecycle\table\step_table;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\table\active_manual_workflows_table;
+use tool_lifecycle\local\table\workflow_definition_table;
+use tool_lifecycle\local\table\active_automatic_workflows_table;
+use tool_lifecycle\local\table\step_table;
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/classes/event/process_proceeded.php b/classes/event/process_proceeded.php
index 47a97750d2fb5671691ff747732d7aa73c526a2f..0df4ac716448c4a923d5a91b9ca5f96dd2a5108f 100644
--- a/classes/event/process_proceeded.php
+++ b/classes/event/process_proceeded.php
@@ -24,7 +24,7 @@
 namespace tool_lifecycle\event;
 
 use moodle_url;
-use \tool_lifecycle\entity\process;
+use tool_lifecycle\local\entity\process;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/event/process_rollback.php b/classes/event/process_rollback.php
index 85331a67fcad154b426e2f5518e4dc6fc2598870..8f333b3777ab4a73a66454e3f2a0b2d82d70c355 100644
--- a/classes/event/process_rollback.php
+++ b/classes/event/process_rollback.php
@@ -25,7 +25,7 @@
 namespace tool_lifecycle\event;
 
 use moodle_url;
-use \tool_lifecycle\entity\process;
+use tool_lifecycle\local\entity\process;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/event/process_triggered.php b/classes/event/process_triggered.php
index ab25e44795c46d9a0cfa23294658430e05cc4ecc..dcde2225f088971ea69ab6c15fdcf3d76edc8ccd 100644
--- a/classes/event/process_triggered.php
+++ b/classes/event/process_triggered.php
@@ -25,7 +25,7 @@
 namespace tool_lifecycle\event;
 
 use moodle_url;
-use \tool_lifecycle\entity\process;
+use tool_lifecycle\local\entity\process;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/local/backup/backup_lifecycle_workflow.php b/classes/local/backup/backup_lifecycle_workflow.php
index 1abe072ce3b2b893d42b0f95c735842dba5856e0..81eb2d0130358883386d8b7e3ed66310ce53f9cb 100644
--- a/classes/local/backup/backup_lifecycle_workflow.php
+++ b/classes/local/backup/backup_lifecycle_workflow.php
@@ -22,13 +22,13 @@
  */
 namespace tool_lifecycle\local\backup;
 
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\settings_manager;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\settings_manager;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/classes/local/backup/restore_lifecycle_workflow.php b/classes/local/backup/restore_lifecycle_workflow.php
index d02b18499e7c18bde96717f70143d604161481c5..39d54702f050efc5a742d96841153b32f57ffde1 100644
--- a/classes/local/backup/restore_lifecycle_workflow.php
+++ b/classes/local/backup/restore_lifecycle_workflow.php
@@ -22,13 +22,13 @@
  */
 namespace tool_lifecycle\local\backup;
 
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\settings_manager;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\settings_manager;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/classes/entity/process.php b/classes/local/entity/process.php
similarity index 98%
rename from classes/entity/process.php
rename to classes/local/entity/process.php
index 5a21cb09ba47376d8f4c7c93fc8fb0bf3585d16e..d77f2f98ac58b69daa0fd929ecb46ff740d95643 100644
--- a/classes/entity/process.php
+++ b/classes/local/entity/process.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\entity;
+namespace tool_lifecycle\local\entity;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/entity/step_subplugin.php b/classes/local/entity/step_subplugin.php
similarity index 98%
rename from classes/entity/step_subplugin.php
rename to classes/local/entity/step_subplugin.php
index 4e4ce20c44a794282e6cf7c4ee682c4c5b77ab32..81cca5b6d7d10980a8b3cc54c245db4e1f2a1071 100644
--- a/classes/entity/step_subplugin.php
+++ b/classes/local/entity/step_subplugin.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\entity;
+namespace tool_lifecycle\local\entity;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/entity/subplugin.php b/classes/local/entity/subplugin.php
similarity index 98%
rename from classes/entity/subplugin.php
rename to classes/local/entity/subplugin.php
index ca8f51c85868ae31c7938188358fdbc5cf2add28..d01510b1810b315fc81b5e7d604604a56c6ab1ab 100644
--- a/classes/entity/subplugin.php
+++ b/classes/local/entity/subplugin.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\entity;
+namespace tool_lifecycle\local\entity;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/entity/trigger_subplugin.php b/classes/local/entity/trigger_subplugin.php
similarity index 98%
rename from classes/entity/trigger_subplugin.php
rename to classes/local/entity/trigger_subplugin.php
index 9d5093792ef3490ed737bfae94609d876e0e8b68..ddcbf774d8e01f37fac1494ed78b984d9b7b9c62 100644
--- a/classes/entity/trigger_subplugin.php
+++ b/classes/local/entity/trigger_subplugin.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\entity;
+namespace tool_lifecycle\local\entity;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/entity/workflow.php b/classes/local/entity/workflow.php
similarity index 99%
rename from classes/entity/workflow.php
rename to classes/local/entity/workflow.php
index f442da1421e88fdc0a72d03b45cf2c21de9832dd..eb692473835cc3363ba71b99e3c247b3db667b13 100644
--- a/classes/entity/workflow.php
+++ b/classes/local/entity/workflow.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\entity;
+namespace tool_lifecycle\local\entity;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/form/form_step_instance.php b/classes/local/form/form_step_instance.php
similarity index 97%
rename from classes/form/form_step_instance.php
rename to classes/local/form/form_step_instance.php
index c098a666b1a1086a63d697314514a51645006e1d..542817c8446ae647ec03b635aef5dc244ab7e745 100644
--- a/classes/form/form_step_instance.php
+++ b/classes/local/form/form_step_instance.php
@@ -21,12 +21,12 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\form;
+namespace tool_lifecycle\local\form;
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 use tool_lifecycle\step\libbase;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/classes/form/form_trigger_instance.php b/classes/local/form/form_trigger_instance.php
similarity index 96%
rename from classes/form/form_trigger_instance.php
rename to classes/local/form/form_trigger_instance.php
index 4847b0b9d7923cecc6873c72258fb1a9d1534f02..71653a7fc74f44b8b2a15512f367691f66fd182d 100644
--- a/classes/form/form_trigger_instance.php
+++ b/classes/local/form/form_trigger_instance.php
@@ -21,13 +21,13 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\form;
+namespace tool_lifecycle\local\form;
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 use tool_lifecycle\trigger\base;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/classes/form/form_upload_workflow.php b/classes/local/form/form_upload_workflow.php
similarity index 97%
rename from classes/form/form_upload_workflow.php
rename to classes/local/form/form_upload_workflow.php
index 8573c0df3cf587fdbedc8ca7e718117b455a22c9..5ce328c795f90f3cf8531c322c76c81bdc62b392 100644
--- a/classes/form/form_upload_workflow.php
+++ b/classes/local/form/form_upload_workflow.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\form;
+namespace tool_lifecycle\local\form;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/form/form_workflow_instance.php b/classes/local/form/form_workflow_instance.php
similarity index 98%
rename from classes/form/form_workflow_instance.php
rename to classes/local/form/form_workflow_instance.php
index 71e934defe312e5632d9c528575e73faf092d053..6355962ffea3460fdb0131110e4a05b6311266d7 100644
--- a/classes/form/form_workflow_instance.php
+++ b/classes/local/form/form_workflow_instance.php
@@ -21,9 +21,9 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\form;
+namespace tool_lifecycle\local\form;
 
-use tool_lifecycle\entity\workflow;
+use tool_lifecycle\local\entity\workflow;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/manager/backup_manager.php b/classes/local/manager/backup_manager.php
similarity index 99%
rename from classes/manager/backup_manager.php
rename to classes/local/manager/backup_manager.php
index 7c270ba0dab243131cc163c6eff4cf12bf2cd399..89ee0864923d908f7f41e022a7a97025f150ea54 100644
--- a/classes/manager/backup_manager.php
+++ b/classes/local/manager/backup_manager.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/manager/delayed_courses_manager.php b/classes/local/manager/delayed_courses_manager.php
similarity index 99%
rename from classes/manager/delayed_courses_manager.php
rename to classes/local/manager/delayed_courses_manager.php
index d07a698b68ab54d1461bb119023694e186f75f97..cb989ec8dfbc6affb870338bc443681294d3cdab 100644
--- a/classes/manager/delayed_courses_manager.php
+++ b/classes/local/manager/delayed_courses_manager.php
@@ -22,7 +22,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
 defined('MOODLE_INTERNAL') || die();
 /**
diff --git a/classes/manager/interaction_manager.php b/classes/local/manager/interaction_manager.php
similarity index 98%
rename from classes/manager/interaction_manager.php
rename to classes/local/manager/interaction_manager.php
index 67996fcb57be7d32ad649b5e0f0903352d65bd3b..5dbe2d45f531bcee597e90d610fcde46614a2ebc 100644
--- a/classes/manager/interaction_manager.php
+++ b/classes/local/manager/interaction_manager.php
@@ -21,11 +21,11 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
-use tool_lifecycle\entity\process;
+use tool_lifecycle\local\entity\process;
 use tool_lifecycle\processor;
-use tool_lifecycle\response\step_interactive_response;
+use tool_lifecycle\local\response\step_interactive_response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/manager/lib_manager.php b/classes/local/manager/lib_manager.php
similarity index 99%
rename from classes/manager/lib_manager.php
rename to classes/local/manager/lib_manager.php
index 3d4873d54897d4e916440a078a7b6c97c0fbff0a..7e8277735069d1018dfb55de02fc76476d183b57 100644
--- a/classes/manager/lib_manager.php
+++ b/classes/local/manager/lib_manager.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
 use tool_lifecycle\step\libbase;
 use tool_lifecycle\trigger\base;
diff --git a/classes/manager/process_data_manager.php b/classes/local/manager/process_data_manager.php
similarity index 96%
rename from classes/manager/process_data_manager.php
rename to classes/local/manager/process_data_manager.php
index afd2dd98fd011dce83af2476b58fa0c7aad24b87..fb3f168198f52b778d1dd8bfa4fc2a3e2935da05 100644
--- a/classes/manager/process_data_manager.php
+++ b/classes/local/manager/process_data_manager.php
@@ -25,10 +25,10 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
-use tool_lifecycle\entity\process;
-use tool_lifecycle\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\process;
+use tool_lifecycle\local\entity\trigger_subplugin;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/manager/process_manager.php b/classes/local/manager/process_manager.php
similarity index 98%
rename from classes/manager/process_manager.php
rename to classes/local/manager/process_manager.php
index 97af8d4ab488062dc51a28c18833c6c41324a6a6..48268d6a9972c94f78470490517231757fcb7186 100644
--- a/classes/manager/process_manager.php
+++ b/classes/local/manager/process_manager.php
@@ -21,9 +21,9 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
-use tool_lifecycle\entity\process;
+use tool_lifecycle\local\entity\process;
 use tool_lifecycle\event\process_proceeded;
 use tool_lifecycle\event\process_rollback;
 
diff --git a/classes/manager/settings_manager.php b/classes/local/manager/settings_manager.php
similarity index 98%
rename from classes/manager/settings_manager.php
rename to classes/local/manager/settings_manager.php
index fbdd29652915cf0b6ede2f31b1a61f0e4bdbd453..b6ca7de23f84f7de61341e5934ff4c78614764e7 100644
--- a/classes/manager/settings_manager.php
+++ b/classes/local/manager/settings_manager.php
@@ -21,12 +21,12 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__.'/../../lib.php');
+require_once(__DIR__.'/../../../lib.php');
 
 /**
  * Manager to retrive the local settings for each step subplugin.
diff --git a/classes/manager/step_manager.php b/classes/local/manager/step_manager.php
similarity index 99%
rename from classes/manager/step_manager.php
rename to classes/local/manager/step_manager.php
index 3eb769825f2bd3686461ebe2c3c932435aaadeb3..4a03f4ee57fb07c8b567040fa78e3a2f01e9dd56 100644
--- a/classes/manager/step_manager.php
+++ b/classes/local/manager/step_manager.php
@@ -21,10 +21,10 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\step_subplugin;
+use tool_lifecycle\local\entity\step_subplugin;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/classes/manager/subplugin_manager.php b/classes/local/manager/subplugin_manager.php
similarity index 98%
rename from classes/manager/subplugin_manager.php
rename to classes/local/manager/subplugin_manager.php
index 1e53076cb81cdacc7cce1810b457bde359c804fe..8728582f15ab31a2f53c4db5c21751a70bc03abe 100644
--- a/classes/manager/subplugin_manager.php
+++ b/classes/local/manager/subplugin_manager.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
 defined('MOODLE_INTERNAL') || die();
 // This file is part of Moodle - http://moodle.org/
diff --git a/classes/manager/trigger_manager.php b/classes/local/manager/trigger_manager.php
similarity index 98%
rename from classes/manager/trigger_manager.php
rename to classes/local/manager/trigger_manager.php
index ddae60b2f261604a52cdb6a363c9398437e024c4..e59a8a4af65979274e9d32c37a464923f35cb031 100644
--- a/classes/manager/trigger_manager.php
+++ b/classes/local/manager/trigger_manager.php
@@ -21,11 +21,11 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/classes/manager/workflow_manager.php b/classes/local/manager/workflow_manager.php
similarity index 99%
rename from classes/manager/workflow_manager.php
rename to classes/local/manager/workflow_manager.php
index 6aa0d2569856846877e70538522a013988cdd042..690d139712dfc884187f9065f6520b2401d7f914 100644
--- a/classes/manager/workflow_manager.php
+++ b/classes/local/manager/workflow_manager.php
@@ -21,11 +21,11 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\manager;
+namespace tool_lifecycle\local\manager;
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
 use tool_lifecycle\local\backup\backup_lifecycle_workflow;
 use tool_lifecycle\local\data\manual_trigger_tool;
 use tool_lifecycle\settings_type;
diff --git a/classes/response/step_interactive_response.php b/classes/local/response/step_interactive_response.php
similarity index 98%
rename from classes/response/step_interactive_response.php
rename to classes/local/response/step_interactive_response.php
index d37340406ec44a796f69a407db777632b72855a9..f9c89d414fde3a681a426abfaef78acc11ee5bab 100644
--- a/classes/response/step_interactive_response.php
+++ b/classes/local/response/step_interactive_response.php
@@ -21,7 +21,7 @@
  * @copyright  2018 WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\response;
+namespace tool_lifecycle\local\response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/response/step_response.php b/classes/local/response/step_response.php
similarity index 98%
rename from classes/response/step_response.php
rename to classes/local/response/step_response.php
index 9a1c643e03a41d4ef398f36026e2cf721b2ebf59..f6301d74169dfec5023e0274bb838425a812a784 100644
--- a/classes/response/step_response.php
+++ b/classes/local/response/step_response.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\response;
+namespace tool_lifecycle\local\response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/response/trigger_response.php b/classes/local/response/trigger_response.php
similarity index 98%
rename from classes/response/trigger_response.php
rename to classes/local/response/trigger_response.php
index 4c3fcec5b50bbaba22a27471f9cd080c97f4c845..9e4f09752314094299406e94b64e1e0c7870c6e1 100644
--- a/classes/response/trigger_response.php
+++ b/classes/local/response/trigger_response.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\response;
+namespace tool_lifecycle\local\response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/table/active_automatic_workflows_table.php b/classes/local/table/active_automatic_workflows_table.php
similarity index 94%
rename from classes/table/active_automatic_workflows_table.php
rename to classes/local/table/active_automatic_workflows_table.php
index b647704f1bf4895d92704462b733fb88a9cf6bfd..58b42034af76b6e20dcd1a756e104f5692366b00 100644
--- a/classes/table/active_automatic_workflows_table.php
+++ b/classes/local/table/active_automatic_workflows_table.php
@@ -21,17 +21,17 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
 use tool_lifecycle\action;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
 require_once($CFG->libdir . '/tablelib.php');
-require_once(__DIR__ . '/../../lib.php');
+require_once(__DIR__ . '/../../../lib.php');
 
 /**
  * Table listing all active automatically triggered workflows.
diff --git a/classes/table/active_manual_workflows_table.php b/classes/local/table/active_manual_workflows_table.php
similarity index 90%
rename from classes/table/active_manual_workflows_table.php
rename to classes/local/table/active_manual_workflows_table.php
index f1bdfd635730371d91e59d8d4ea5fed2f068b712..5452a9232649c89bc5efdae0c54c15170fe4ba61 100644
--- a/classes/table/active_manual_workflows_table.php
+++ b/classes/local/table/active_manual_workflows_table.php
@@ -21,17 +21,17 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
 require_once($CFG->libdir . '/tablelib.php');
-require_once(__DIR__ . '/../../lib.php');
+require_once(__DIR__ . '/../../../lib.php');
 
 /**
  * Table listing all active manually triggered workflows.
diff --git a/classes/table/active_processes_table.php b/classes/local/table/active_processes_table.php
similarity index 98%
rename from classes/table/active_processes_table.php
rename to classes/local/table/active_processes_table.php
index 63308695ef1fe71a9a508ed4e60435552c540894..b545f82c0f1ecf47b41cca564f13fa4fc97b8143 100644
--- a/classes/table/active_processes_table.php
+++ b/classes/local/table/active_processes_table.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/classes/table/active_workflows_table.php b/classes/local/table/active_workflows_table.php
similarity index 93%
rename from classes/table/active_workflows_table.php
rename to classes/local/table/active_workflows_table.php
index 9bd5d812421e08f95d1c2bd485047873b4335587..d3f35c4dde492c10eae1ad6d404f44ec1d9c5847 100644
--- a/classes/table/active_workflows_table.php
+++ b/classes/local/table/active_workflows_table.php
@@ -21,18 +21,18 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
 use tool_lifecycle\action;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
 require_once($CFG->libdir . '/tablelib.php');
-require_once(__DIR__ . '/../../lib.php');
+require_once(__DIR__ . '/../../../lib.php');
 
 /**
  * Table listing all active workflow definitions.
diff --git a/classes/table/course_backups_table.php b/classes/local/table/course_backups_table.php
similarity index 99%
rename from classes/table/course_backups_table.php
rename to classes/local/table/course_backups_table.php
index 78d1f08f8779da1cbfe449711b329cbe26bb0791..b803a3037f61f028b6dbdffc1fac7bdedf02c881 100644
--- a/classes/table/course_backups_table.php
+++ b/classes/local/table/course_backups_table.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/classes/table/deactivated_workflows_table.php b/classes/local/table/deactivated_workflows_table.php
similarity index 96%
rename from classes/table/deactivated_workflows_table.php
rename to classes/local/table/deactivated_workflows_table.php
index 7c7f59ed65b5445901bc340da246b61e72bc7465..d16ce42e8ccf39f9dbefd26aa36c976572a4ac17 100644
--- a/classes/table/deactivated_workflows_table.php
+++ b/classes/local/table/deactivated_workflows_table.php
@@ -21,12 +21,12 @@
  * @copyright  2018 Yorick Reum, JMU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
 use tool_lifecycle\action;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/classes/table/interaction_attention_table.php b/classes/local/table/interaction_attention_table.php
similarity index 96%
rename from classes/table/interaction_attention_table.php
rename to classes/local/table/interaction_attention_table.php
index 845b4136c9d66b94ab22cff689dacd1bbafa97d2..3375a57c0ade3445efffe691a20a4244971e3d04 100644
--- a/classes/table/interaction_attention_table.php
+++ b/classes/local/table/interaction_attention_table.php
@@ -21,11 +21,11 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
-use tool_lifecycle\manager\interaction_manager;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\step_manager;
+use tool_lifecycle\local\manager\interaction_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\step_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/classes/table/interaction_remaining_table.php b/classes/local/table/interaction_remaining_table.php
similarity index 98%
rename from classes/table/interaction_remaining_table.php
rename to classes/local/table/interaction_remaining_table.php
index 8d84ea9ffe52393660e565cb742ec857e02683a6..27cc90e9c7230cc0c9c2530e090077dfc9d3f7cc 100644
--- a/classes/table/interaction_remaining_table.php
+++ b/classes/local/table/interaction_remaining_table.php
@@ -21,10 +21,10 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/classes/table/interaction_table.php b/classes/local/table/interaction_table.php
similarity index 92%
rename from classes/table/interaction_table.php
rename to classes/local/table/interaction_table.php
index 8b2db10eac0353db601ea9312042fe4ab8dff0a9..68a15738d0b7adacc2c39debfb7795bf94359e49 100644
--- a/classes/table/interaction_table.php
+++ b/classes/local/table/interaction_table.php
@@ -21,13 +21,13 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\manager\interaction_manager;
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\manager\interaction_manager;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/classes/table/step_table.php b/classes/local/table/step_table.php
similarity index 97%
rename from classes/table/step_table.php
rename to classes/local/table/step_table.php
index 0b85115569deddd349e7753cee7718c8e58bd5f7..b55a9c0fcd2869861969389a9ffeaa62790bd72d 100644
--- a/classes/table/step_table.php
+++ b/classes/local/table/step_table.php
@@ -21,18 +21,18 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
 require_once($CFG->libdir . '/tablelib.php');
-require_once(__DIR__ . '/../../lib.php');
+require_once(__DIR__ . '/../../../lib.php');
 
 /**
  * Table listing step instances
diff --git a/classes/table/workflow_definition_table.php b/classes/local/table/workflow_definition_table.php
similarity index 94%
rename from classes/table/workflow_definition_table.php
rename to classes/local/table/workflow_definition_table.php
index 631865c97c397d6d7b09b79734d462f9ee9ee58f..5666037d933c708324f56c6797f241d9b8054102 100644
--- a/classes/table/workflow_definition_table.php
+++ b/classes/local/table/workflow_definition_table.php
@@ -21,18 +21,18 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
 use tool_lifecycle\action;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
 require_once($CFG->libdir . '/tablelib.php');
-require_once(__DIR__ . '/../../lib.php');
+require_once(__DIR__ . '/../../../lib.php');
 
 /**
  * Table listing all workflow definitions.
diff --git a/classes/table/workflow_table.php b/classes/local/table/workflow_table.php
similarity index 95%
rename from classes/table/workflow_table.php
rename to classes/local/table/workflow_table.php
index 6ad652729aba4b6e0d352786646de9af6ca6f352..8634d38b0508d519578ded07ca8118b84bf7ccff 100644
--- a/classes/table/workflow_table.php
+++ b/classes/local/table/workflow_table.php
@@ -21,18 +21,18 @@
  * @copyright  2018 Jan Dageförde WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\table;
+namespace tool_lifecycle\local\table;
 
 use tool_lifecycle\action;
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die;
 
 require_once($CFG->libdir . '/tablelib.php');
-require_once(__DIR__ . '/../../lib.php');
+require_once(__DIR__ . '/../../../lib.php');
 
 /**
  * Table listing all active automatically triggered workflows.
diff --git a/classes/plugininfo/lifecyclestep.php b/classes/plugininfo/lifecyclestep.php
index cfc53df62e4776f24eec3e0d4b0c46ab32d419a1..59ff802dc5fab36e1cd0327d5799168f666fe96c 100644
--- a/classes/plugininfo/lifecyclestep.php
+++ b/classes/plugininfo/lifecyclestep.php
@@ -24,8 +24,8 @@
 namespace tool_lifecycle\plugininfo;
 
 use core\plugininfo\base;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/plugininfo/lifecycletrigger.php b/classes/plugininfo/lifecycletrigger.php
index 12652a320bb6226ca0054a469c9de9ec30bb07c5..ba686424451d0b73a5f03d56219816550cf64d8c 100644
--- a/classes/plugininfo/lifecycletrigger.php
+++ b/classes/plugininfo/lifecycletrigger.php
@@ -24,10 +24,10 @@
 namespace tool_lifecycle\plugininfo;
 
 use core\plugininfo\base;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 use tool_usertours\step;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/classes/processor.php b/classes/processor.php
index 3256c59733c9b7348e1f0e1a006259868d3f8e4d..7ed8f10e15a3c285f483cd2107516f6c37b4dcb4 100644
--- a/classes/processor.php
+++ b/classes/processor.php
@@ -23,17 +23,17 @@
  */
 namespace tool_lifecycle;
 
-use tool_lifecycle\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\trigger_subplugin;
 use tool_lifecycle\event\process_triggered;
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\manager\delayed_courses_manager;
-use tool_lifecycle\response\step_interactive_response;
-use tool_lifecycle\response\step_response;
-use tool_lifecycle\response\trigger_response;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\manager\delayed_courses_manager;
+use tool_lifecycle\local\response\step_interactive_response;
+use tool_lifecycle\local\response\step_response;
+use tool_lifecycle\local\response\trigger_response;
 
 
 defined('MOODLE_INTERNAL') || die;
diff --git a/classes/task/lifecycle_task.php b/classes/task/lifecycle_task.php
index a1b5481dcbd36446c4a31b1465b9dce5752fb305..d956865b38d2d082561f89324ff4a4597a467558 100644
--- a/classes/task/lifecycle_task.php
+++ b/classes/task/lifecycle_task.php
@@ -23,8 +23,8 @@
  */
 namespace tool_lifecycle\task;
 
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\step_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\step_manager;
 use tool_lifecycle\processor;
 
 defined('MOODLE_INTERNAL') || die;
diff --git a/classes/view_controller.php b/classes/view_controller.php
index 28d636d99afd5e445ed2317ec309a30d63baaa46..5e1d8085b2979c809da4d6007a69d800c8a5aa84 100644
--- a/classes/view_controller.php
+++ b/classes/view_controller.php
@@ -24,15 +24,15 @@
 namespace tool_lifecycle;
 
 use core\notification;
-use tool_lifecycle\manager\interaction_manager;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\table\interaction_log_table;
-use tool_lifecycle\table\interaction_remaining_table;
-use tool_lifecycle\table\interaction_attention_table;
+use tool_lifecycle\local\manager\interaction_manager;
+use tool_lifecycle\local\manager\lib_manager;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\table\interaction_log_table;
+use tool_lifecycle\local\table\interaction_remaining_table;
+use tool_lifecycle\local\table\interaction_attention_table;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/coursebackups.php b/coursebackups.php
index 6c8aee2bee9e640f9bb529398524fffe93f1bb71..0b157191b675a041a60c5878df052d2936fe827f 100644
--- a/coursebackups.php
+++ b/coursebackups.php
@@ -32,7 +32,7 @@ admin_externalpage_setup('tool_lifecycle_coursebackups');
 
 $PAGE->set_url(new \moodle_url('/admin/tool/lifecycle/coursebackups.php'));
 
-$table = new tool_lifecycle\table\course_backups_table('tool_lifecycle_course_backups');
+$table = new tool_lifecycle\local\table\course_backups_table('tool_lifecycle_course_backups');
 
 $PAGE->set_title(get_string('course_backups_list_header', 'tool_lifecycle'));
 $PAGE->set_heading(get_string('course_backups_list_header', 'tool_lifecycle'));
diff --git a/db/upgrade.php b/db/upgrade.php
index 2d970f454de7516932a14848b2b9f9ff78b61091..1ee58e39902355f4db55431fcd2fa385058af038 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -247,13 +247,13 @@ function xmldb_tool_lifecycle_upgrade($oldversion) {
     }
 
     if ($oldversion < 2018022005) {
-        $workflows = \tool_lifecycle\manager\workflow_manager::get_active_workflows();
+        $workflows = \tool_lifecycle\local\manager\workflow_manager::get_active_workflows();
         foreach ($workflows as $workflow) {
             if ($workflow->manual === null) {
-                $trigger = \tool_lifecycle\manager\trigger_manager::get_triggers_for_workflow($workflow->id)[0];
-                $lib = \tool_lifecycle\manager\lib_manager::get_trigger_lib($trigger->subpluginname);
+                $trigger = \tool_lifecycle\local\manager\trigger_manager::get_triggers_for_workflow($workflow->id)[0];
+                $lib = \tool_lifecycle\local\manager\lib_manager::get_trigger_lib($trigger->subpluginname);
                 $workflow->manual = $lib->is_manual_trigger();
-                \tool_lifecycle\manager\workflow_manager::insert_or_update($workflow);
+                \tool_lifecycle\local\manager\workflow_manager::insert_or_update($workflow);
             }
         }
         // Lifecycle savepoint reached.
diff --git a/deactivatedworkflows.php b/deactivatedworkflows.php
index f501630e5f350b53ea4a4599a6032110d3316d8d..8ce81b88abdd068e1994c6e5c9044b26694b8c16 100644
--- a/deactivatedworkflows.php
+++ b/deactivatedworkflows.php
@@ -25,7 +25,7 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once(__DIR__ . '/adminlib.php');
 
-use tool_lifecycle\table\deactivated_workflows_table;
+use tool_lifecycle\local\table\deactivated_workflows_table;
 
 $PAGE->set_context(context_system::instance());
 require_login(null, false);
@@ -42,7 +42,7 @@ admin_externalpage_setup('tool_lifecycle_deactivatedworkflows');
 $workflowid = optional_param('workflowid', null, PARAM_INT);
 $action = optional_param('action', null, PARAM_TEXT);
 if ($workflowid && $action) {
-    \tool_lifecycle\manager\workflow_manager::handle_action($action, $workflowid);
+    \tool_lifecycle\local\manager\workflow_manager::handle_action($action, $workflowid);
 }
 
 $renderer = $PAGE->get_renderer('tool_lifecycle');
diff --git a/renderer.php b/renderer.php
index 278570011f8944c93ce9d553bd3f29073f0959e3..745f433129a1fc00753ecbbb781e06c3469867d9 100644
--- a/renderer.php
+++ b/renderer.php
@@ -57,7 +57,7 @@ class tool_lifecycle_renderer extends plugin_renderer_base {
 
     /**
      * Renders the workflow upload form including errors, which occured during upload.
-     * @param \tool_lifecycle\form\form_upload_workflow $form
+     * @param \tool_lifecycle\local\form\form_upload_workflow $form
      * @param array $errors
      * @throws coding_exception
      */
diff --git a/restore.php b/restore.php
index 37277f4cb090ddbda82cf2e99e41a3913e619ef2..55b276cf94b5dd11d1bac33d6cfae3f017a415b6 100644
--- a/restore.php
+++ b/restore.php
@@ -23,7 +23,7 @@
  */
 require_once(__DIR__ . '/../../../config.php');
 
-use tool_lifecycle\manager\backup_manager;
+use tool_lifecycle\local\manager\backup_manager;
 
 $PAGE->set_context(context_system::instance());
 require_login(null, false);
diff --git a/step/createbackup/db/upgrade.php b/step/createbackup/db/upgrade.php
index 2884072d369625622c8eebdf1a581bb55c28f722..bfa92b839c48758c2d411cfdddee221c2c612813 100644
--- a/step/createbackup/db/upgrade.php
+++ b/step/createbackup/db/upgrade.php
@@ -22,8 +22,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\step_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\step_manager;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/step/createbackup/lib.php b/step/createbackup/lib.php
index 2e9a9a85e9ff322273765ae0a741cdaf96511f61..5c0fa5a0c4cf9fe0a9110c2d7ab42208ad884764 100644
--- a/step/createbackup/lib.php
+++ b/step/createbackup/lib.php
@@ -23,9 +23,9 @@
  */
 namespace tool_lifecycle\step;
 
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\response\step_response;
-use tool_lifecycle\manager\backup_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\response\step_response;
+use tool_lifecycle\local\manager\backup_manager;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/step/deletecourse/db/upgrade.php b/step/deletecourse/db/upgrade.php
index b6dd64a5aa83174bedf9fac23eb8ab52d293cf2d..668a910e9621226fc85662b7eb4b48d522b1b301 100644
--- a/step/deletecourse/db/upgrade.php
+++ b/step/deletecourse/db/upgrade.php
@@ -22,8 +22,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\step_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\step_manager;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/step/deletecourse/lib.php b/step/deletecourse/lib.php
index a11f01452e99b27684e251a26629fcdb589de5c0..bf14d91913481e39b2659a366255673a011f13fc 100644
--- a/step/deletecourse/lib.php
+++ b/step/deletecourse/lib.php
@@ -23,8 +23,8 @@
  */
 namespace tool_lifecycle\step;
 
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\response\step_response;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\response\step_response;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/step/duplicate/classes/form_duplicate.php b/step/duplicate/classes/form_duplicate.php
index 183328cfb5b6ffef8126a389cc521ac0701f2a4d..2a852dbf6e853010652262278d7d482e9169b87a 100644
--- a/step/duplicate/classes/form_duplicate.php
+++ b/step/duplicate/classes/form_duplicate.php
@@ -23,7 +23,7 @@
  */
 namespace lifecyclestep_duplicate;
 
-use tool_lifecycle\manager\process_manager;
+use tool_lifecycle\local\manager\process_manager;
 use tool_lifecycle\step\interactionduplicate;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/step/duplicate/interactionlib.php b/step/duplicate/interactionlib.php
index 169c8e277effb716bf494a090915ccfca5d63c87..f3d04ac6482b72120beb7c6d2bbc0deff10df362 100644
--- a/step/duplicate/interactionlib.php
+++ b/step/duplicate/interactionlib.php
@@ -24,11 +24,11 @@
 namespace tool_lifecycle\step;
 
 use lifecyclestep_duplicate\form_duplicate;
-use tool_lifecycle\entity\process;
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\manager\process_data_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\response\step_interactive_response;
+use tool_lifecycle\local\entity\process;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\manager\process_data_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\response\step_interactive_response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/step/duplicate/lib.php b/step/duplicate/lib.php
index 4a969b9bbec172a4f6cbe178ae6f6c3594ace1c9..201c997d2b84b3a579b599c2ce1381c21500e1cb 100644
--- a/step/duplicate/lib.php
+++ b/step/duplicate/lib.php
@@ -23,11 +23,11 @@
  */
 namespace tool_lifecycle\step;
 
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\response\step_response;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\process_data_manager;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\response\step_response;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\process_data_manager;
 use tool_usertours\step;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/step/email/interactionlib.php b/step/email/interactionlib.php
index f438bd95f7974d198c756ed44d3511773d8cafac..9124cff6005071e9c95b3745bed94807e2d7b97a 100644
--- a/step/email/interactionlib.php
+++ b/step/email/interactionlib.php
@@ -23,13 +23,13 @@
  */
 namespace tool_lifecycle\step;
 
-use tool_lifecycle\entity\process;
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\manager\process_data_manager;
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\response\step_interactive_response;
+use tool_lifecycle\local\entity\process;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\manager\process_data_manager;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\response\step_interactive_response;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/step/email/lib.php b/step/email/lib.php
index 7d9eb361352ccdf4a701fd424b4e06a79dc19460..f063d2d79d89e10cff20bc7f5db79bb1a21d72ef 100644
--- a/step/email/lib.php
+++ b/step/email/lib.php
@@ -23,11 +23,11 @@
 namespace tool_lifecycle\step;
 
 use core_user;
-use tool_lifecycle\manager\process_manager;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\response\step_response;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\process_data_manager;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\response\step_response;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\process_data_manager;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/step/interactionlib.php b/step/interactionlib.php
index 038042e97c0b3c0661dc4530bf9aab401eb6170a..9e27698fdf5619055e34a0413b7100a838d9e140 100644
--- a/step/interactionlib.php
+++ b/step/interactionlib.php
@@ -27,9 +27,9 @@ namespace tool_lifecycle\step;
 
 use core_user;
 use MongoDB\BSON\Timestamp;
-use tool_lifecycle\entity\process;
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\response\step_interactive_response;
+use tool_lifecycle\local\entity\process;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\response\step_interactive_response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/step/lib.php b/step/lib.php
index ae70a17f9d2254179a17ef8d6df6c1628b285d60..e9ee290c45cbe42baa109f9291e5cf933a88ba09 100644
--- a/step/lib.php
+++ b/step/lib.php
@@ -24,8 +24,8 @@
  */
 namespace tool_lifecycle\step;
 
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\response\step_response;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\response\step_response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/tests/active_workflow_is_manual_test.php b/tests/active_workflow_is_manual_test.php
index 27992979f3b7454feab1677fbc0d5975a6eb7ae3..0ae330dccc176c98010fbeb7b1d039cfc07499f1 100644
--- a/tests/active_workflow_is_manual_test.php
+++ b/tests/active_workflow_is_manual_test.php
@@ -28,8 +28,8 @@ require_once(__DIR__ . '/generator/lib.php');
 require_once(__DIR__ . '/../lib.php');
 
 use tool_lifecycle\action;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\entity\workflow;
 
 /**
  * Tests the field is manual after activating workflows.
diff --git a/tests/active_workflow_sortindex_updown_test.php b/tests/active_workflow_sortindex_updown_test.php
index 85affabc19b3b34620edd4defd4a85ab38a3ca63..823357880ec244d3666376d02eac9ad956e2a19f 100644
--- a/tests/active_workflow_sortindex_updown_test.php
+++ b/tests/active_workflow_sortindex_updown_test.php
@@ -30,7 +30,7 @@ require_once(__DIR__ . '/../lib.php');
 require_once(__DIR__ . '/workflow_actions_testcase.php');
 
 use tool_lifecycle\action;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 /**
  * Tests the different state changes of the workflow sortindex for up and down action.
diff --git a/tests/backup_and_restore_workflow_test.php b/tests/backup_and_restore_workflow_test.php
index b006cce0ef5bb567e41cf7fdf702d1c005aa97de..ed8135613129e3d0e20b32efb84bdfe3508c543b 100644
--- a/tests/backup_and_restore_workflow_test.php
+++ b/tests/backup_and_restore_workflow_test.php
@@ -29,11 +29,11 @@ require_once(__DIR__ . '/../lib.php');
 
 use tool_lifecycle\local\backup\backup_lifecycle_workflow;
 use tool_lifecycle\local\backup\restore_lifecycle_workflow;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\entity\workflow;
 use tool_lifecycle\settings_type;
 
 /**
@@ -109,7 +109,7 @@ class tool_lifecycle_backup_and_restore_workflow_testcase extends \advanced_test
             $this->assertEquals($newworkflow->id, $newstep->workflowid);
             $oldsettings = settings_manager::get_settings($oldstep->id, settings_type::STEP);
             $newsettings = settings_manager::get_settings($newstep->id, settings_type::STEP);
-            $lib = \tool_lifecycle\manager\lib_manager::get_step_lib($newstep->subpluginname);
+            $lib = \tool_lifecycle\local\manager\lib_manager::get_step_lib($newstep->subpluginname);
             $settingsdef = $lib->instance_settings();
             foreach ($settingsdef as $def) {
                 if (array_key_exists($def->name, $oldsettings)) {
@@ -131,7 +131,7 @@ class tool_lifecycle_backup_and_restore_workflow_testcase extends \advanced_test
             $this->assertEquals($newworkflow->id, $newtrig->workflowid);
             $oldsettings = settings_manager::get_settings($oldtrig->id, settings_type::TRIGGER);
             $newsettings = settings_manager::get_settings($newtrig->id, settings_type::TRIGGER);
-            $lib = \tool_lifecycle\manager\lib_manager::get_trigger_lib($newtrig->subpluginname);
+            $lib = \tool_lifecycle\local\manager\lib_manager::get_trigger_lib($newtrig->subpluginname);
             $settingsdef = $lib->instance_settings();
             foreach ($settingsdef as $def) {
                 if (array_key_exists($def->name, $oldsettings)) {
diff --git a/tests/backup_manager_test.php b/tests/backup_manager_test.php
index dadf053d36317c56527e940e5d08f5b61f922bd1..9e9865a6dced9c842a01969921630f4e7cae5504 100644
--- a/tests/backup_manager_test.php
+++ b/tests/backup_manager_test.php
@@ -24,7 +24,7 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lifecycle\manager\backup_manager;
+use tool_lifecycle\local\manager\backup_manager;
 
 /**
  * Tests the beckup manager.
diff --git a/tests/generator/lib.php b/tests/generator/lib.php
index 254c12d688aa72b36157be952f3eb173ff30c911..35a4ac7eccdba127fa24efea6e930463e47308e3 100644
--- a/tests/generator/lib.php
+++ b/tests/generator/lib.php
@@ -24,14 +24,14 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lifecycle\entity\process;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\process;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 use tool_lifecycle\settings_type;
 
 /**
diff --git a/tests/manual_trigger_tools_test.php b/tests/manual_trigger_tools_test.php
index a23ebf4a0efafb47125c3bead422e333e3a3bf8b..81ba80a03ab0358bef9f1e25f77edd8c6c851274 100644
--- a/tests/manual_trigger_tools_test.php
+++ b/tests/manual_trigger_tools_test.php
@@ -25,9 +25,9 @@
 defined('MOODLE_INTERNAL') || die();
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\manager\trigger_manager;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\manager\trigger_manager;
 use tool_lifecycle\local\data\manual_trigger_tool;
 
 /**
diff --git a/tests/manually_triggered_process_test.php b/tests/manually_triggered_process_test.php
index 96546cca0789081abf9ca04beef48b94b75d4233..5251f4064c31d85cc1644257b5759a9ad9c16e6f 100644
--- a/tests/manually_triggered_process_test.php
+++ b/tests/manually_triggered_process_test.php
@@ -29,11 +29,11 @@ require_once(__DIR__ . '/generator/lib.php');
 require_once(__DIR__ . '/../lib.php');
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\process_manager;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\process_manager;
 use tool_lifecycle\processor;
 use tool_lifecycle\settings_type;
 
diff --git a/tests/persistence/persist_process_data_test.php b/tests/persistence/persist_process_data_test.php
index 676a76ee6beb4db0076421fd586fbfb3553409f3..2803171ca199ec6d270ab90efb4273d0f334dedb 100644
--- a/tests/persistence/persist_process_data_test.php
+++ b/tests/persistence/persist_process_data_test.php
@@ -26,10 +26,10 @@ defined('MOODLE_INTERNAL') || die();
 
 require_once(__DIR__ . '/../../lib.php');
 
-use tool_lifecycle\entity\process;
-use \tool_lifecycle\manager\process_manager;
-use \tool_lifecycle\manager\process_data_manager;
-use \tool_lifecycle\manager\step_manager;
+use tool_lifecycle\local\entity\process;
+use tool_lifecycle\local\manager\process_manager;
+use tool_lifecycle\local\manager\process_data_manager;
+use tool_lifecycle\local\manager\step_manager;
 
 /**
  * Tests creating storing and retrieving process data.
diff --git a/tests/persistence/persist_process_test.php b/tests/persistence/persist_process_test.php
index f66d51e88d1d117517dd5e1fb62edb0400da6d65..08a7cfaf6399aaa69ebe9416728a259f90a4dca3 100644
--- a/tests/persistence/persist_process_test.php
+++ b/tests/persistence/persist_process_test.php
@@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die();
 
 require_once(__DIR__ . '/../../lib.php');
 
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\delayed_courses_manager;
-use \tool_lifecycle\manager\process_manager;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\delayed_courses_manager;
+use tool_lifecycle\local\manager\process_manager;
 
 /**
  * Tests creating storing and retrieving a process object.
diff --git a/tests/persistence/persist_step_test.php b/tests/persistence/persist_step_test.php
index a6ffd246b5198b6adeb5368c82d49827e93adfc1..0432a6734a06157bdbda47aa5e227b02be25f50b 100644
--- a/tests/persistence/persist_step_test.php
+++ b/tests/persistence/persist_step_test.php
@@ -27,8 +27,8 @@ defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__ . '/../../lib.php');
 
 use tool_lifecycle\action;
-use \tool_lifecycle\entity\workflow;
-use \tool_lifecycle\manager\step_manager;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\step_manager;
 
 /**
  * Tests creating storing and retrieving a step object.
diff --git a/tests/persistence/persist_workflow_test.php b/tests/persistence/persist_workflow_test.php
index 7f86028bed093dcbc562fcfa8acf32dcbead7b32..57dc4c0c0464a90c9dc05a7fa4ed1e34baa64418 100644
--- a/tests/persistence/persist_workflow_test.php
+++ b/tests/persistence/persist_workflow_test.php
@@ -26,8 +26,8 @@ defined('MOODLE_INTERNAL') || die();
 
 require_once(__DIR__ . '/../../lib.php');
 
-use \tool_lifecycle\entity\workflow;
-use \tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
 
 /**
  * Tests creating storing and retrieving a workflow object.
diff --git a/tests/process_status_message_test.php b/tests/process_status_message_test.php
index 1b07f797cd54cdd27bf25e3f31de4c0d89b7c133..1a9105c9e0fc5f9e8784b26594eb6895d166425d 100644
--- a/tests/process_status_message_test.php
+++ b/tests/process_status_message_test.php
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 use tool_lifecycle\action;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
 
 /**
  * Tests assembly of manual trigger tools.
@@ -78,15 +78,15 @@ class tool_lifecycle_process_status_message_testcase extends \advanced_testcase
      */
     public function test_get_status_message() {
         $process = $this->generator->create_process(2, $this->workflow->id);
-        $message = \tool_lifecycle\manager\interaction_manager::get_process_status_message($process->id);
+        $message = \tool_lifecycle\local\manager\interaction_manager::get_process_status_message($process->id);
         $this->assertEquals(get_string("workflow_started", "tool_lifecycle"), $message);
 
-        \tool_lifecycle\manager\process_manager::proceed_process($process);
-        $message = \tool_lifecycle\manager\interaction_manager::get_process_status_message($process->id);
+        \tool_lifecycle\local\manager\process_manager::proceed_process($process);
+        $message = \tool_lifecycle\local\manager\interaction_manager::get_process_status_message($process->id);
         $this->assertEquals(get_string("workflow_is_running", "tool_lifecycle"), $message);
 
-        \tool_lifecycle\manager\process_manager::proceed_process($process);
-        $message = \tool_lifecycle\manager\interaction_manager::get_process_status_message($process->id);
+        \tool_lifecycle\local\manager\process_manager::proceed_process($process);
+        $message = \tool_lifecycle\local\manager\interaction_manager::get_process_status_message($process->id);
         $this->assertEquals(get_string('status_message_requiresattention', 'lifecyclestep_email'), $message);
     }
 }
\ No newline at end of file
diff --git a/tests/settings_manager_test.php b/tests/settings_manager_test.php
index d2eb7594d323f7f2af59a80980dd355d8d60b22c..4e5c770fe838e614d3cdb1754afe98eb32c448f4 100644
--- a/tests/settings_manager_test.php
+++ b/tests/settings_manager_test.php
@@ -24,13 +24,13 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\subplugin_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\step_subplugin;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\subplugin_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 use tool_lifecycle\settings_type;
 
 /**
@@ -66,7 +66,7 @@ class tool_lifecycle_settings_manager_testcase extends \advanced_testcase {
         $this->workflow = $generator->create_workflow();
         $this->step = new step_subplugin('instancename', 'email', $this->workflow->id);
         step_manager::insert_or_update($this->step);
-        $this->trigger = \tool_lifecycle\manager\trigger_manager::get_triggers_for_workflow($this->workflow->id)[0];
+        $this->trigger = \tool_lifecycle\local\manager\trigger_manager::get_triggers_for_workflow($this->workflow->id)[0];
     }
 
     /**
diff --git a/tests/workflow_actions_testcase.php b/tests/workflow_actions_testcase.php
index e3a81b613f0563bd5a9216b71e5828d3f4273408..cc9ee82fd31477058ba2981fc148d6e11c039a6b 100644
--- a/tests/workflow_actions_testcase.php
+++ b/tests/workflow_actions_testcase.php
@@ -27,8 +27,8 @@ defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__ . '/generator/lib.php');
 require_once(__DIR__ . '/../lib.php');
 
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
 
 /**
  * Setup for workflow actions tests.
diff --git a/tests/workflow_activate_disable_duplicate_test.php b/tests/workflow_activate_disable_duplicate_test.php
index f63f2e99d7fa5a78c6c243f8e9b5025e3ce6fdf9..a888076eceb85c4836cf7581fc3471e1a2e829a0 100644
--- a/tests/workflow_activate_disable_duplicate_test.php
+++ b/tests/workflow_activate_disable_duplicate_test.php
@@ -30,8 +30,8 @@ require_once(__DIR__ . '/../lib.php');
 require_once(__DIR__ . '/workflow_actions_testcase.php');
 
 use tool_lifecycle\action;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\entity\workflow;
+use tool_lifecycle\local\manager\workflow_manager;
+use tool_lifecycle\local\entity\workflow;
 
 /**
  * Tests activating, disabling and duplicating workflows
@@ -105,8 +105,8 @@ class tool_lifecycle_workflow_activate_disable_duplicate_testcase extends workfl
             }
         }
         $this->assertEquals($this->workflow1->displaytitle, $duplicate->displaytitle);
-        $workflow1stepcount = count(\tool_lifecycle\manager\step_manager::get_step_instances($this->workflow1->id));
-        $duplicatestepcount = count(\tool_lifecycle\manager\step_manager::get_step_instances($duplicate->id));
+        $workflow1stepcount = count(\tool_lifecycle\local\manager\step_manager::get_step_instances($this->workflow1->id));
+        $duplicatestepcount = count(\tool_lifecycle\local\manager\step_manager::get_step_instances($duplicate->id));
         $this->assertEquals($workflow1stepcount, $duplicatestepcount);
     }
 
diff --git a/trigger/categories/lib.php b/trigger/categories/lib.php
index 902231ae3a901c61eeb5da81fe314ddf8f43da25..acb296188e24a8d638185e0ab0f5c7e59f47b53b 100644
--- a/trigger/categories/lib.php
+++ b/trigger/categories/lib.php
@@ -24,8 +24,8 @@
 namespace tool_lifecycle\trigger;
 
 use coursecat;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\response\trigger_response;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\response\trigger_response;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/trigger/categories/tests/generator/lib.php b/trigger/categories/tests/generator/lib.php
index 6cc8b9f20f7c92036f5b88b802822e7bc2f20e80..8d3bb50f763855c9d3b6796a7bd8447a89727f68 100644
--- a/trigger/categories/tests/generator/lib.php
+++ b/trigger/categories/tests/generator/lib.php
@@ -24,11 +24,11 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 use tool_lifecycle\settings_type;
 
 /**
diff --git a/trigger/categories/tests/trigger_test.php b/trigger/categories/tests/trigger_test.php
index b841b1244e9fe31ffef620a7559ef44081bff296..3c92c857e68d237d03ed0fa0444e5aae2170c55e 100644
--- a/trigger/categories/tests/trigger_test.php
+++ b/trigger/categories/tests/trigger_test.php
@@ -24,9 +24,9 @@
  */
 namespace tool_lifecycle\trigger;
 
-use tool_lifecycle\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\trigger_subplugin;
 use tool_lifecycle\processor;
-use tool_lifecycle\response\trigger_response;
+use tool_lifecycle\local\response\trigger_response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/trigger/delayedcourses/db/install.php b/trigger/delayedcourses/db/install.php
index fe8eb6195615beb54e9ac62431503ae901d9c1b2..a107f77a4a26d632e4f0f16115a0c159e8383510 100644
--- a/trigger/delayedcourses/db/install.php
+++ b/trigger/delayedcourses/db/install.php
@@ -22,7 +22,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-use tool_lifecycle\manager\trigger_manager;
+use tool_lifecycle\local\manager\trigger_manager;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/trigger/delayedcourses/lib.php b/trigger/delayedcourses/lib.php
index df7758459bdba3ffd8767aa08c6335590816752f..054385c6438f29e575fb2c94e3b50ac08c7c4ef0 100644
--- a/trigger/delayedcourses/lib.php
+++ b/trigger/delayedcourses/lib.php
@@ -23,8 +23,8 @@
  */
 namespace tool_lifecycle\trigger;
 
-use tool_lifecycle\response\trigger_response;
-use tool_lifecycle\manager\delayed_courses_manager;
+use tool_lifecycle\local\response\trigger_response;
+use tool_lifecycle\local\manager\delayed_courses_manager;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__ . '/../lib.php');
diff --git a/trigger/delayedcourses/tests/generator/lib.php b/trigger/delayedcourses/tests/generator/lib.php
index 34c50e86f6f231ba8940c925125e52db9f81b65d..1561e1dcf7ec94af3350c671f29a45db6ba89db8 100644
--- a/trigger/delayedcourses/tests/generator/lib.php
+++ b/trigger/delayedcourses/tests/generator/lib.php
@@ -24,10 +24,10 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 /**
  * lifecycletrigger_delayedcourses generator tests
diff --git a/trigger/delayedcourses/tests/trigger_test.php b/trigger/delayedcourses/tests/trigger_test.php
index 2ffaf2afaf0f38d058bcc6dd6d57bd11a5a3c12b..6560af542e44f7ed67a43ae69850f4cef6cdfe29 100644
--- a/trigger/delayedcourses/tests/trigger_test.php
+++ b/trigger/delayedcourses/tests/trigger_test.php
@@ -24,10 +24,10 @@
  */
 namespace tool_lifecycle\trigger;
 
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
 use tool_lifecycle\processor;
-use tool_lifecycle\manager\delayed_courses_manager;
+use tool_lifecycle\local\manager\delayed_courses_manager;
 use tool_lifecycle_trigger_delayedcourses_generator as trigger_generator;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/trigger/lib.php b/trigger/lib.php
index 1c68d0c42aecd844be1eb167a7959e577ccc3312..f36d216a75df068013cbe5263778335e59644784 100644
--- a/trigger/lib.php
+++ b/trigger/lib.php
@@ -25,7 +25,7 @@
  */
 namespace tool_lifecycle\trigger;
 
-use tool_lifecycle\response\trigger_response;
+use tool_lifecycle\local\response\trigger_response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/trigger/sitecourse/db/install.php b/trigger/sitecourse/db/install.php
index 6f5600aa6384b40e2e6eb24639a7c7fdb4d73663..bb5292505c008db956f6aa017f0b7c6fd9f43f37 100644
--- a/trigger/sitecourse/db/install.php
+++ b/trigger/sitecourse/db/install.php
@@ -21,7 +21,7 @@
  * @copyright  2017 Tobias Reischmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-use tool_lifecycle\manager\trigger_manager;
+use tool_lifecycle\local\manager\trigger_manager;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/trigger/sitecourse/lib.php b/trigger/sitecourse/lib.php
index 3dea124597e9d018ebdc007fce8223bf8d6ba360..14809c74fcf889cb36abd4666bbad981b1daf6e6 100644
--- a/trigger/sitecourse/lib.php
+++ b/trigger/sitecourse/lib.php
@@ -23,7 +23,7 @@
  */
 namespace tool_lifecycle\trigger;
 
-use tool_lifecycle\response\trigger_response;
+use tool_lifecycle\local\response\trigger_response;
 
 defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__ . '/../lib.php');
diff --git a/trigger/sitecourse/tests/generator/lib.php b/trigger/sitecourse/tests/generator/lib.php
index 94d01c2717de9aa665c593e9d1c124504918a999..4942d8c675c2d326d5d22d310a9ec8368a7b5bef 100644
--- a/trigger/sitecourse/tests/generator/lib.php
+++ b/trigger/sitecourse/tests/generator/lib.php
@@ -24,10 +24,10 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 
 /**
  * lifecycletrigger_sitecourse generator tests
diff --git a/trigger/sitecourse/tests/trigger_test.php b/trigger/sitecourse/tests/trigger_test.php
index 66622f18fb05ca0205a36fdb4ae67001601952ee..1cec1ea8ae39e167589378cff02b2b6d22577f69 100644
--- a/trigger/sitecourse/tests/trigger_test.php
+++ b/trigger/sitecourse/tests/trigger_test.php
@@ -24,8 +24,8 @@
  */
 namespace tool_lifecycle\trigger;
 
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\response\trigger_response;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\response\trigger_response;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/trigger/specificdate/lib.php b/trigger/specificdate/lib.php
index 2782a49fe8516183f3823e07619cdabc921194e2..297016d753f2e6a1f9087bcfe41fc62bf3e46591 100644
--- a/trigger/specificdate/lib.php
+++ b/trigger/specificdate/lib.php
@@ -24,9 +24,9 @@
 namespace tool_lifecycle\trigger;
 
 use DateTime;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\response\trigger_response;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\response\trigger_response;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/trigger/startdatedelay/lib.php b/trigger/startdatedelay/lib.php
index 4cfac5a0ff69572ecd1def650fd79ae26149a246..7d0cd6491ddc67b1cccc63336eb7af071e138039 100644
--- a/trigger/startdatedelay/lib.php
+++ b/trigger/startdatedelay/lib.php
@@ -23,8 +23,8 @@
  */
 namespace tool_lifecycle\trigger;
 
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\response\trigger_response;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\response\trigger_response;
 use tool_lifecycle\settings_type;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/trigger/startdatedelay/tests/generator/lib.php b/trigger/startdatedelay/tests/generator/lib.php
index aa4bde42ee325a68c7fc2721455297d6839cca57..c3bd5cee91680efb0410db4ee475d627d9f0cdf0 100644
--- a/trigger/startdatedelay/tests/generator/lib.php
+++ b/trigger/startdatedelay/tests/generator/lib.php
@@ -24,11 +24,11 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lifecycle\entity\trigger_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\settings_manager;
-use tool_lifecycle\manager\trigger_manager;
-use tool_lifecycle\manager\workflow_manager;
+use tool_lifecycle\local\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\workflow;
+use tool_lifecycle\local\manager\settings_manager;
+use tool_lifecycle\local\manager\trigger_manager;
+use tool_lifecycle\local\manager\workflow_manager;
 use tool_lifecycle\settings_type;
 
 /**
diff --git a/trigger/startdatedelay/tests/trigger_test.php b/trigger/startdatedelay/tests/trigger_test.php
index 434aa27c5a5400f7860b6f7a2688336ad2d0816b..eeab387b7e0b9b79121b41479d56fd868b178eb9 100644
--- a/trigger/startdatedelay/tests/trigger_test.php
+++ b/trigger/startdatedelay/tests/trigger_test.php
@@ -24,7 +24,7 @@
  */
 namespace tool_lifecycle\trigger;
 
-use tool_lifecycle\entity\trigger_subplugin;
+use tool_lifecycle\local\entity\trigger_subplugin;
 use tool_lifecycle\processor;
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/version.php b/version.php
index f39d537e6125732b4f85587beeaf0ba1503c56f9..03546b64f0e9cf8a7a390bf93bf1d33e963623ad 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die;
 
 $plugin->maturity = MATURITY_BETA;
-$plugin->version  = 2019090500;
+$plugin->version  = 2019102900;
 $plugin->component = 'tool_lifecycle';
 $plugin->requires = 2017111300; // Require Moodle 3.4 (or above).
 $plugin->release = 'v3.7-r1';
diff --git a/view.php b/view.php
index b971491b675f151681a97edacc06f104adeb10b6..b0970e7deda73cf1bd64fa27fea98e75a8c605ca 100644
--- a/view.php
+++ b/view.php
@@ -23,9 +23,9 @@
  */
 require_once(__DIR__ . '/../../../config.php');
 
-use tool_lifecycle\manager\step_manager;
-use tool_lifecycle\manager\interaction_manager;
-use tool_lifecycle\table\interaction_attention_table;
+use tool_lifecycle\local\manager\step_manager;
+use tool_lifecycle\local\manager\interaction_manager;
+use tool_lifecycle\local\table\interaction_attention_table;
 
 require_login(null, false);
 
diff --git a/workflowsettings.php b/workflowsettings.php
index 0b020faa3ecc508524ab54a337a506176b09d8ea..27321b66e574860f819a22e71e51ae00dccf3c37 100644
--- a/workflowsettings.php
+++ b/workflowsettings.php
@@ -30,7 +30,7 @@ require_capability('moodle/site:config', context_system::instance());
 
 $workflowid = required_param('workflowid', PARAM_INT);
 
-$workflow = tool_lifecycle\manager\workflow_manager::get_workflow($workflowid);
+$workflow = tool_lifecycle\local\manager\workflow_manager::get_workflow($workflowid);
 
 if (!$workflow) {
     throw new moodle_exception('workflownotfound', 'tool_lifecycle',