diff --git a/classes/form/form_delays_filter.php b/classes/local/form/form_delays_filter.php
similarity index 91%
rename from classes/form/form_delays_filter.php
rename to classes/local/form/form_delays_filter.php
index dd8ac0021a56f649b032441d97e5a56cb1288f2d..4c316eb5b5e609580a4b349738e0b9866f207fcb 100644
--- a/classes/form/form_delays_filter.php
+++ b/classes/local/form/form_delays_filter.php
@@ -21,15 +21,9 @@
  * @copyright  2019 Justus Dieckmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lifecycle\form;
+namespace tool_lifecycle\local\form;
 
-use cache;
-use tool_lifecycle\action;
-use tool_lifecycle\entity\step_subplugin;
-use tool_lifecycle\entity\workflow;
-use tool_lifecycle\manager\lib_manager;
-use tool_lifecycle\manager\workflow_manager;
-use tool_lifecycle\step\libbase;
+use tool_lifecycle\local\manager\workflow_manager;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/classes/table/delayed_courses_table.php b/classes/local/table/delayed_courses_table.php
similarity index 97%
rename from classes/table/delayed_courses_table.php
rename to classes/local/table/delayed_courses_table.php
index 49e4a5a3c6cc78b4d27b3928736d88096f657068..95cb68bae9452a3c08d2dd7ac401c7729ad9a0cf 100644
--- a/classes/table/delayed_courses_table.php
+++ b/classes/local/table/delayed_courses_table.php
@@ -15,13 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Table listing all courses for a specific user and a specific subplugin
+ * Table listing all delayed courses
  *
  * @package tool_lifecycle
- * @copyright  2017 Tobias Reischmann WWU
+ * @copyright  2019 Justus Dieckmann 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;
 
@@ -31,7 +31,7 @@ require_once($CFG->libdir . '/tablelib.php');
  * Table listing all delayed courses
  *
  * @package tool_lifecycle
- * @copyright  2017 Tobias Reischmann WWU
+ * @copyright  2019 Justus Dieckmann WWU
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class delayed_courses_table extends \table_sql {
diff --git a/delayedcourses.php b/delayedcourses.php
index 8957dbf68b95c0a0f218be9daf339d89aa5fd4a5..923cd36b9ce23a84bbeb02687680f2d537cbadcb 100644
--- a/delayedcourses.php
+++ b/delayedcourses.php
@@ -22,8 +22,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-use tool_lifecycle\form\form_delays_filter;
-use tool_lifecycle\table\delayed_courses_table;
+use tool_lifecycle\local\form\form_delays_filter;
+use tool_lifecycle\local\table\delayed_courses_table;
 
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir . '/adminlib.php');