diff --git a/competency/classes/api.php b/competency/classes/api.php
index ffc2ac4cf3f..c26c57ae063 100644
--- a/competency/classes/api.php
+++ b/competency/classes/api.php
@@ -164,7 +164,7 @@ class api {
         $competency->set_sortorder(null);
         $competency->create();
 
-        \tool_lp\event\competency_created::create_from_competency($competency)->trigger();
+        \core\event\competency_created::create_from_competency($competency)->trigger();
 
         // Reset the rule of the parent.
         $parent = $competency->get_parent();
@@ -223,7 +223,7 @@ class api {
             user_evidence_competency::delete_by_competencyids($competencyids);
 
             // Register the competencies deleted events.
-            $events = \tool_lp\event\competency_deleted::create_multiple_from_competencyids($competencyids, $contextid);
+            $events = \core\event\competency_deleted::create_multiple_from_competencyids($competencyids, $contextid);
 
         } catch (\Exception $e) {
             $transaction->rollback($e);
@@ -417,7 +417,7 @@ class api {
         $result = $competency->update();
 
         // Trigger the update event.
-        \tool_lp\event\competency_updated::create_from_competency($competency)->trigger();
+        \core\event\competency_updated::create_from_competency($competency)->trigger();
 
         return $result;
     }
@@ -553,7 +553,7 @@ class api {
         $framework = $framework->create();
 
         // Trigger a competency framework created event.
-        \tool_lp\event\competency_framework_created::create_from_framework($framework)->trigger();
+        \core\event\competency_framework_created::create_from_framework($framework)->trigger();
 
         return $framework;
     }
@@ -622,7 +622,7 @@ class api {
         }
 
         // Trigger a competency framework created event.
-        \tool_lp\event\competency_framework_created::create_from_framework($framework)->trigger();
+        \core\event\competency_framework_created::create_from_framework($framework)->trigger();
 
         return $framework;
     }
@@ -661,11 +661,11 @@ class api {
             }
 
             // Create a competency framework deleted event.
-            $event = \tool_lp\event\competency_framework_deleted::create_from_framework($framework);
+            $event = \core\event\competency_framework_deleted::create_from_framework($framework);
             $result = $framework->delete();
 
             // Register the deleted events competencies.
-            $events = \tool_lp\event\competency_deleted::create_multiple_from_competencyids($competenciesid, $contextid);
+            $events = \core\event\competency_deleted::create_multiple_from_competencyids($competenciesid, $contextid);
 
         } catch (\Exception $e) {
             $transaction->rollback($e);
@@ -707,7 +707,7 @@ class api {
         }
 
         // Trigger a competency framework updated event.
-        \tool_lp\event\competency_framework_updated::create_from_framework($framework)->trigger();
+        \core\event\competency_framework_updated::create_from_framework($framework)->trigger();
 
         return $framework->update();
     }
@@ -744,7 +744,7 @@ class api {
         if (!has_any_capability(array('moodle/competency:competencyview', 'moodle/competency:competencymanage'), $framework->get_context())) {
              throw new required_capability_exception($framework->get_context(), 'moodle/competency:competencyview', 'nopermissions', '');
         }
-        \tool_lp\event\competency_framework_viewed::create_from_framework($framework)->trigger();
+        \core\event\competency_framework_viewed::create_from_framework($framework)->trigger();
         return true;
     }
 
@@ -765,7 +765,7 @@ class api {
              throw new required_capability_exception($competency->get_context(), 'moodle/competency:competencyview', 'nopermissions', '');
         }
 
-        \tool_lp\event\competency_viewed::create_from_competency($competency)->trigger();
+        \core\event\competency_viewed::create_from_competency($competency)->trigger();
         return true;
     }
 
@@ -1713,7 +1713,7 @@ class api {
         $template = $template->create();
 
         // Trigger a template created event.
-        \tool_lp\event\template_created::create_from_template($template)->trigger();
+        \core\event\competency_template_created::create_from_template($template)->trigger();
 
         return $template;
     }
@@ -1750,7 +1750,7 @@ class api {
         }
 
         // Trigger a template created event.
-        \tool_lp\event\template_created::create_from_template($duplicatedtemplate)->trigger();
+        \core\event\competency_template_created::create_from_template($duplicatedtemplate)->trigger();
 
         return $duplicatedtemplate;
     }
@@ -1806,7 +1806,7 @@ class api {
         // OK - all set.
         if ($success) {
             // Create a template deleted event.
-            $event = \tool_lp\event\template_deleted::create_from_template($template);
+            $event = \core\event\competency_template_deleted::create_from_template($template);
 
             $success = $template->delete();
         }
@@ -1870,7 +1870,7 @@ class api {
         }
 
         // Trigger a template updated event.
-        \tool_lp\event\template_updated::create_from_template($template)->trigger();
+        \core\event\competency_template_updated::create_from_template($template)->trigger();
 
         if ($updateplans) {
             plan::update_multiple_from_template($template);
@@ -2437,7 +2437,7 @@ class api {
         $plan->create();
 
         // Trigger created event.
-        \tool_lp\event\plan_created::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_created::create_from_plan($plan)->trigger();
         return $plan;
     }
 
@@ -2499,7 +2499,7 @@ class api {
         $plan->create();
 
         // Trigger created event.
-        \tool_lp\event\plan_created::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_created::create_from_plan($plan)->trigger();
         return $plan;
     }
 
@@ -2572,7 +2572,7 @@ class api {
 
             $plan->create();
             // Trigger created event.
-            \tool_lp\event\plan_created::create_from_plan($plan)->trigger();
+            \core\event\competency_plan_created::create_from_plan($plan)->trigger();
             $created++;
         }
 
@@ -2631,7 +2631,7 @@ class api {
         $transaction->allow_commit();
 
         // Trigger unlinked event.
-        \tool_lp\event\plan_unlinked::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_unlinked::create_from_plan($plan)->trigger();
 
         return $success;
     }
@@ -2677,7 +2677,7 @@ class api {
         $plan->update();
 
         // Trigger updated event.
-        \tool_lp\event\plan_updated::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_updated::create_from_plan($plan)->trigger();
 
         return $plan;
     }
@@ -2720,7 +2720,7 @@ class api {
         }
 
         // Trigger a template viewed event.
-        \tool_lp\event\plan_viewed::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_viewed::create_from_plan($plan)->trigger();
 
         return true;
     }
@@ -2757,7 +2757,7 @@ class api {
         if ($plan->get_status() == plan::STATUS_COMPLETE) {
             self::remove_archived_user_competencies_in_plan($plan);
         }
-        $event = \tool_lp\event\plan_deleted::create_from_plan($plan);
+        $event = \core\event\competency_plan_deleted::create_from_plan($plan);
         $success = $plan->delete();
 
         $transaction->allow_commit();
@@ -2798,7 +2798,7 @@ class api {
         $result = $plan->update();
 
         // Trigger review request cancelled event.
-        \tool_lp\event\plan_review_request_cancelled::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_review_request_cancelled::create_from_plan($plan)->trigger();
 
         return $result;
     }
@@ -2833,7 +2833,7 @@ class api {
         $result = $plan->update();
 
         // Trigger review requested event.
-        \tool_lp\event\plan_review_requested::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_review_requested::create_from_plan($plan)->trigger();
 
         return $result;
     }
@@ -2870,7 +2870,7 @@ class api {
         $result = $plan->update();
 
         // Trigger review started event.
-        \tool_lp\event\plan_review_started::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_review_started::create_from_plan($plan)->trigger();
 
         return $result;
     }
@@ -2906,7 +2906,7 @@ class api {
         $result = $plan->update();
 
         // Trigger review stopped event.
-        \tool_lp\event\plan_review_stopped::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_review_stopped::create_from_plan($plan)->trigger();
 
         return $result;
     }
@@ -2945,7 +2945,7 @@ class api {
         $result = $plan->update();
 
         // Trigger approved event.
-        \tool_lp\event\plan_approved::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_approved::create_from_plan($plan)->trigger();
 
         return $result;
     }
@@ -2982,7 +2982,7 @@ class api {
         $result = $plan->update();
 
         // Trigger unapproved event.
-        \tool_lp\event\plan_unapproved::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_unapproved::create_from_plan($plan)->trigger();
 
         return $result;
     }
@@ -3037,7 +3037,7 @@ class api {
         $transaction->allow_commit();
 
         // Trigger updated event.
-        \tool_lp\event\plan_completed::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_completed::create_from_plan($plan)->trigger();
 
         return $success;
     }
@@ -3096,7 +3096,7 @@ class api {
         $transaction->allow_commit();
 
         // Trigger reopened event.
-        \tool_lp\event\plan_reopened::create_from_plan($plan)->trigger();
+        \core\event\competency_plan_reopened::create_from_plan($plan)->trigger();
 
         return $success;
     }
@@ -3384,7 +3384,7 @@ class api {
         $uc->set_status(user_competency::STATUS_IDLE);
         $result = $uc->update();
         if ($result) {
-            \tool_lp\event\user_competency_review_request_cancelled::create_from_user_competency($uc)->trigger();
+            \core\event\competency_user_competency_review_request_cancelled::create_from_user_competency($uc)->trigger();
         }
         return $result;
     }
@@ -3415,7 +3415,7 @@ class api {
         $uc->set_status(user_competency::STATUS_WAITING_FOR_REVIEW);
         $result = $uc->update();
         if ($result) {
-            \tool_lp\event\user_competency_review_requested::create_from_user_competency($uc)->trigger();
+            \core\event\competency_user_competency_review_requested::create_from_user_competency($uc)->trigger();
         }
         return $result;
     }
@@ -3445,7 +3445,7 @@ class api {
         $uc->set_reviewerid($USER->id);
         $result = $uc->update();
         if ($result) {
-            \tool_lp\event\user_competency_review_started::create_from_user_competency($uc)->trigger();
+            \core\event\competency_user_competency_review_started::create_from_user_competency($uc)->trigger();
         }
         return $result;
     }
@@ -3472,7 +3472,7 @@ class api {
         $uc->set_status(user_competency::STATUS_IDLE);
         $result = $uc->update();
         if ($result) {
-            \tool_lp\event\user_competency_review_stopped::create_from_user_competency($uc)->trigger();
+            \core\event\competency_user_competency_review_stopped::create_from_user_competency($uc)->trigger();
         }
         return $result;
     }
@@ -3494,7 +3494,7 @@ class api {
             throw new required_capability_exception($uc->get_context(), 'moodle/competency:usercompetencyview', 'nopermissions', '');
         }
 
-        \tool_lp\event\user_competency_viewed::create_from_user_competency_viewed($uc)->trigger();
+        \core\event\competency_user_competency_viewed::create_from_user_competency_viewed($uc)->trigger();
         return true;
     }
 
@@ -3520,7 +3520,7 @@ class api {
             throw new coding_exception('To log the user competency in completed plan use user_competency_plan_viewed method.');
         }
 
-        \tool_lp\event\user_competency_viewed_in_plan::create_from_user_competency_viewed_in_plan($uc, $planid)->trigger();
+        \core\event\competency_user_competency_viewed_in_plan::create_from_user_competency_viewed_in_plan($uc, $planid)->trigger();
         return true;
     }
 
@@ -3545,7 +3545,7 @@ class api {
         // Validate the course, this will throw an exception if not valid.
         self::validate_course($ucc->get_courseid());
 
-        \tool_lp\event\user_competency_viewed_in_course::create_from_user_competency_viewed_in_course($ucc)->trigger();
+        \core\event\competency_user_competency_viewed_in_course::create_from_user_competency_viewed_in_course($ucc)->trigger();
         return true;
     }
 
@@ -3571,7 +3571,7 @@ class api {
                 . 'user_competency_viewed_in_plan method.');
         }
 
-        \tool_lp\event\user_competency_plan_viewed::create_from_user_competency_plan($ucp)->trigger();
+        \core\event\competency_user_competency_plan_viewed::create_from_user_competency_plan($ucp)->trigger();
         return true;
     }
 
@@ -3699,7 +3699,7 @@ class api {
         }
 
         // Trigger an evidence of prior learning created event.
-        \tool_lp\event\user_evidence_created::create_from_user_evidence($userevidence)->trigger();
+        \core\event\competency_user_evidence_created::create_from_user_evidence($userevidence)->trigger();
 
         return $userevidence;
     }
@@ -3733,7 +3733,7 @@ class api {
         }
 
         // Trigger an evidence of prior learning updated event.
-        \tool_lp\event\user_evidence_updated::create_from_user_evidence($userevidence)->trigger();
+        \core\event\competency_user_evidence_updated::create_from_user_evidence($userevidence)->trigger();
 
         return $userevidence;
     }
@@ -3768,7 +3768,7 @@ class api {
         }
 
         // Trigger an evidence of prior learning deleted event.
-        \tool_lp\event\user_evidence_deleted::create_from_user_evidence($userevidence)->trigger();
+        \core\event\competency_user_evidence_deleted::create_from_user_evidence($userevidence)->trigger();
 
         $userevidence->set_id(0);       // Restore the object.
 
@@ -3940,7 +3940,7 @@ class api {
                 $competency->create();
 
                 // Trigger the created event competency.
-                \tool_lp\event\competency_created::create_from_competency($competency)->trigger();
+                \core\event\competency_created::create_from_competency($competency)->trigger();
 
                 // Match the old id with the new one.
                 $matchids[$parentid] = $competency;
@@ -4395,7 +4395,7 @@ class api {
         $evidence->create();
 
         // Trigger the evidence_created event.
-        \tool_lp\event\evidence_created::create_from_evidence($evidence, $usercompetency, $recommend)->trigger();
+        \core\event\competency_evidence_created::create_from_evidence($evidence, $usercompetency, $recommend)->trigger();
 
         // The competency was marked as completed, apply the rules.
         if ($wascompleted) {
@@ -4656,7 +4656,7 @@ class api {
                                   $note);
         if ($result) {
             $uc->read();
-            $event = \tool_lp\event\user_competency_grade_rated::create_from_user_competency($uc);
+            $event = \core\event\competency_user_competency_rated::create_from_user_competency($uc);
             $event->trigger();
         }
         return $result;
@@ -4709,7 +4709,7 @@ class api {
                                   $note);
         if ($result) {
             $uc = static::get_user_competency($plan->get_userid(), $competency->get_id());
-            $event = \tool_lp\event\user_competency_grade_rated_in_plan::create_from_user_competency($uc, $plan->get_id());
+            $event = \core\event\competency_user_competency_rated_in_plan::create_from_user_competency($uc, $plan->get_id());
             $event->trigger();
         }
         return $result;
@@ -4778,7 +4778,7 @@ class api {
         if ($result) {
             $all = user_competency_course::get_multiple($userid, $course->id, array($competency->get_id()));
             $uc = reset($all);
-            $event = \tool_lp\event\user_competency_grade_rated_in_course::create_from_user_competency_course($uc);
+            $event = \core\event\competency_user_competency_rated_in_course::create_from_user_competency_course($uc);
             $event->trigger();
         }
         return $result;
@@ -4924,7 +4924,7 @@ class api {
         }
 
         // Trigger a template viewed event.
-        \tool_lp\event\template_viewed::create_from_template($template)->trigger();
+        \core\event\competency_template_viewed::create_from_template($template)->trigger();
 
         return true;
     }
diff --git a/admin/tool/lp/tests/event_test.php b/competency/tests/event_test.php
similarity index 91%
rename from admin/tool/lp/tests/event_test.php
rename to competency/tests/event_test.php
index a39f00b3135..a1248fa987c 100644
--- a/admin/tool/lp/tests/event_test.php
+++ b/competency/tests/event_test.php
@@ -17,7 +17,7 @@
 /**
  * Event tests.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -31,11 +31,11 @@ use core_competency\api;
 /**
  * Event tests.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_lp_event_testcase extends advanced_testcase {
+class core_competency_event_testcase extends advanced_testcase {
 
     /**
      * Test the competency framework created event.
@@ -61,7 +61,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\competency_framework_created', $event);
+        $this->assertInstanceOf('\core\event\competency_framework_created', $event);
         $this->assertEquals($framework->get_id(), $event->objectid);
         $this->assertEquals($framework->get_contextid(), $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -88,7 +88,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\competency_framework_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_framework_deleted', $event);
         $this->assertEquals($framework->get_id(), $event->objectid);
         $this->assertEquals($framework->get_contextid(), $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -116,7 +116,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\competency_framework_updated', $event);
+        $this->assertInstanceOf('\core\event\competency_framework_updated', $event);
         $this->assertEquals($framework->get_id(), $event->objectid);
         $this->assertEquals($framework->get_contextid(), $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -143,7 +143,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\competency_framework_viewed', $event);
+        $this->assertInstanceOf('\core\event\competency_framework_viewed', $event);
         $this->assertEquals($framework->get_id(), $event->objectid);
         $this->assertEquals($framework->get_contextid(), $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -168,7 +168,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $events = $sink->get_events();
         $event = reset($events);
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\competency_viewed', $event);
+        $this->assertInstanceOf('\core\event\competency_viewed', $event);
         $this->assertEquals($competency->get_id(), $event->objectid);
         $this->assertEquals($competency->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -191,7 +191,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $events = $sink->get_events();
         $event = reset($events);
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\template_viewed', $event);
+        $this->assertInstanceOf('\core\event\competency_template_viewed', $event);
         $this->assertEquals($template->get_id(), $event->objectid);
         $this->assertEquals($template->get_contextid(), $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -220,7 +220,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $events = $sink->get_events();
         $event = reset($events);
 
-        $this->assertInstanceOf('\tool_lp\event\template_created', $event);
+        $this->assertInstanceOf('\core\event\competency_template_created', $event);
         $this->assertEquals($template->get_id(), $event->objectid);
         $this->assertEquals($template->get_contextid(), $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -247,7 +247,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\template_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_template_deleted', $event);
         $this->assertEquals($template->get_id(), $event->objectid);
         $this->assertEquals($template->get_contextid(), $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -275,7 +275,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\template_updated', $event);
+        $this->assertInstanceOf('\core\event\competency_template_updated', $event);
         $this->assertEquals($template->get_id(), $event->objectid);
         $this->assertEquals($template->get_contextid(), $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -308,7 +308,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\competency_updated', $event);
+        $this->assertInstanceOf('\core\event\competency_updated', $event);
         $this->assertEquals($competency->get_id(), $event->objectid);
         $this->assertEquals($competency->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -339,7 +339,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $events = $sink->get_events();
         $event = reset($events);
 
-        $this->assertInstanceOf('\tool_lp\event\competency_created', $event);
+        $this->assertInstanceOf('\core\event\competency_created', $event);
         $this->assertEquals($competency->get_id(), $event->objectid);
         $this->assertEquals($competency->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -370,16 +370,16 @@ class tool_lp_event_testcase extends advanced_testcase {
         $this->assertEquals(4, count($events));
 
         $event = array_shift($events);
-        $this->assertInstanceOf('\tool_lp\event\competency_created', $event);
+        $this->assertInstanceOf('\core\event\competency_created', $event);
 
         $event = array_shift($events);
-        $this->assertInstanceOf('\tool_lp\event\competency_created', $event);
+        $this->assertInstanceOf('\core\event\competency_created', $event);
 
         $event = array_shift($events);
-        $this->assertInstanceOf('\tool_lp\event\competency_created', $event);
+        $this->assertInstanceOf('\core\event\competency_created', $event);
 
         $event = array_shift($events);
-        $this->assertInstanceOf('\tool_lp\event\competency_framework_created', $event);
+        $this->assertInstanceOf('\core\event\competency_framework_created', $event);
     }
 
     /**
@@ -405,7 +405,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $events = $sink->get_events();
         $event = reset($events);
 
-        $this->assertInstanceOf('\tool_lp\event\competency_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_deleted', $event);
         $this->assertEquals($c1id, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -436,16 +436,16 @@ class tool_lp_event_testcase extends advanced_testcase {
         $this->assertEquals(4, count($events));
 
         $event = array_shift($events);
-        $this->assertInstanceOf('\tool_lp\event\competency_framework_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_framework_deleted', $event);
 
         $event = array_shift($events);
-        $this->assertInstanceOf('\tool_lp\event\competency_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_deleted', $event);
 
         $event = array_shift($events);
-        $this->assertInstanceOf('\tool_lp\event\competency_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_deleted', $event);
 
         $event = array_shift($events);
-        $this->assertInstanceOf('\tool_lp\event\competency_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_deleted', $event);
     }
 
     /**
@@ -469,7 +469,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $events = $sink->get_events();
         $event = reset($events);
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\plan_created', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_created', $event);
         $this->assertEquals($plan->get_id(), $event->objectid);
         $this->assertEquals($plan->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -507,12 +507,12 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = $events[0];
         $plan = $plans[0];
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\plan_created', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_created', $event);
         $this->assertEquals($plan->get_id(), $event->objectid);
         $this->assertEquals($plan->get_context()->id, $event->contextid);
         $event = $events[1];
         $plan = $plans[1];
-        $this->assertInstanceOf('\tool_lp\event\plan_created', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_created', $event);
         $this->assertEquals($plan->get_id(), $event->objectid);
         $this->assertEquals($plan->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -540,7 +540,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_updated', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_updated', $event);
         $this->assertEquals($plan->get_id(), $event->objectid);
         $this->assertEquals($plan->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -567,7 +567,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_deleted', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -592,7 +592,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $events = $sink->get_events();
         $event = reset($events);
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\plan_viewed', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_viewed', $event);
         $this->assertEquals($plan->get_id(), $event->objectid);
         $this->assertEquals($plan->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -623,7 +623,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $events = $sink->get_events();
         $event = reset($events);
 
-        $this->assertInstanceOf('\tool_lp\event\user_evidence_created', $event);
+        $this->assertInstanceOf('\core\event\competency_user_evidence_created', $event);
         $this->assertEquals($userevidence->get_id(), $event->objectid);
         $this->assertEquals($userevidence->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -652,7 +652,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\user_evidence_deleted', $event);
+        $this->assertInstanceOf('\core\event\competency_user_evidence_deleted', $event);
         $this->assertEquals($userevidence->get_id(), $event->objectid);
         $this->assertEquals($userevidence->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -682,7 +682,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\user_evidence_updated', $event);
+        $this->assertInstanceOf('\core\event\competency_user_evidence_updated', $event);
         $this->assertEquals($userevidence->get_id(), $event->objectid);
         $this->assertEquals($userevidence->get_context()->id, $event->contextid);
         $this->assertEventContextNotUsed($event);
@@ -727,7 +727,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\user_competency_viewed_in_plan', $event);
+        $this->assertInstanceOf('\core\event\competency_user_competency_viewed_in_plan', $event);
         $this->assertEquals($uc->get_id(), $event->objectid);
         $this->assertEquals($uc->get_context()->id, $event->contextid);
         $this->assertEquals($uc->get_userid(), $event->relateduserid);
@@ -746,7 +746,7 @@ class tool_lp_event_testcase extends advanced_testcase {
 
         // Other value null.
         try {
-            \tool_lp\event\user_competency_viewed_in_plan::create($params)->trigger();
+            \core\event\competency_user_competency_viewed_in_plan::create($params)->trigger();
             $this->fail('The \'competencyid\' and \'planid\' values must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'competencyid' and 'planid' values must be set./", $e->getMessage());
@@ -755,7 +755,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $params['other']['anythingelse'] = '';
         // Missing competencyid.
         try {
-            \tool_lp\event\user_competency_viewed_in_plan::create($params)->trigger();
+            \core\event\competency_user_competency_viewed_in_plan::create($params)->trigger();
             $this->fail('The \'competencyid\' value must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'competencyid' value must be set./", $e->getMessage());
@@ -764,7 +764,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $params['other']['competencyid'] = $c->get_id();
         // Missing planid.
         try {
-            \tool_lp\event\user_competency_viewed_in_plan::create($params)->trigger();
+            \core\event\competency_user_competency_viewed_in_plan::create($params)->trigger();
             $this->fail('The \'planid\' value must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'planid' value must be set./", $e->getMessage());
@@ -797,7 +797,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\user_competency_viewed_in_course', $event);
+        $this->assertInstanceOf('\core\event\competency_user_competency_viewed_in_course', $event);
         $this->assertEquals($ucc->get_id(), $event->objectid);
         $this->assertEquals(context_course::instance($course->id)->id, $event->contextid);
         $this->assertEquals($ucc->get_userid(), $event->relateduserid);
@@ -816,7 +816,7 @@ class tool_lp_event_testcase extends advanced_testcase {
 
         // Missing courseid.
         try {
-            \tool_lp\event\user_competency_viewed_in_course::create($params)->trigger();
+            \core\event\competency_user_competency_viewed_in_course::create($params)->trigger();
             $this->fail('The \'courseid\' value must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'courseid' value must be set./", $e->getMessage());
@@ -826,7 +826,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $params['courseid'] = $course->id;
         // Missing competencyid.
         try {
-            \tool_lp\event\user_competency_viewed_in_course::create($params)->trigger();
+            \core\event\competency_user_competency_viewed_in_course::create($params)->trigger();
             $this->fail('The \'competencyid\' value must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'competencyid' value must be set./", $e->getMessage());
@@ -874,7 +874,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\user_competency_plan_viewed', $event);
+        $this->assertInstanceOf('\core\event\competency_user_competency_plan_viewed', $event);
         $this->assertEquals($ucp->get_id(), $event->objectid);
         $this->assertEquals($ucp->get_context()->id, $event->contextid);
         $this->assertEquals($ucp->get_userid(), $event->relateduserid);
@@ -893,7 +893,7 @@ class tool_lp_event_testcase extends advanced_testcase {
 
         // Other value null.
         try {
-            \tool_lp\event\user_competency_plan_viewed::create($params)->trigger();
+            \core\event\competency_user_competency_plan_viewed::create($params)->trigger();
             $this->fail('The \'competencyid\' and \'planid\' values must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'competencyid' and 'planid' values must be set./", $e->getMessage());
@@ -902,7 +902,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $params['other']['anythingelse'] = '';
         // Missing competencyid.
         try {
-            \tool_lp\event\user_competency_plan_viewed::create($params)->trigger();
+            \core\event\competency_user_competency_plan_viewed::create($params)->trigger();
             $this->fail('The \'competencyid\' value must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'competencyid' value must be set./", $e->getMessage());
@@ -911,7 +911,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $params['other']['competencyid'] = $c->get_id();
         // Missing planid.
         try {
-            \tool_lp\event\user_competency_plan_viewed::create($params)->trigger();
+            \core\event\competency_user_competency_plan_viewed::create($params)->trigger();
             $this->fail('The \'planid\' value must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'planid' value must be set./", $e->getMessage());
@@ -944,7 +944,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\user_competency_viewed', $event);
+        $this->assertInstanceOf('\core\event\competency_user_competency_viewed', $event);
         $this->assertEquals($uc->get_id(), $event->objectid);
         $this->assertEquals($uc->get_context()->id, $event->contextid);
         $this->assertEquals($uc->get_userid(), $event->relateduserid);
@@ -961,7 +961,7 @@ class tool_lp_event_testcase extends advanced_testcase {
 
         // Missing competencyid.
         try {
-            \tool_lp\event\user_competency_viewed::create($params)->trigger();
+            \core\event\competency_user_competency_viewed::create($params)->trigger();
             $this->fail('The \'competencyid\' value must be set.');
         } catch (coding_exception $e) {
             $this->assertRegExp("/The 'competencyid' value must be set./", $e->getMessage());
@@ -988,7 +988,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_approved', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_approved', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1016,7 +1016,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_unapproved', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_unapproved', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1044,7 +1044,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_reopened', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_reopened', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1072,7 +1072,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_completed', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_completed', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1105,7 +1105,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_unlinked', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_unlinked', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1133,7 +1133,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_review_requested', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_review_requested', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1161,7 +1161,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_review_request_cancelled', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_review_request_cancelled', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1189,7 +1189,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_review_started', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_review_started', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1217,7 +1217,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // Get our event event.
         $events = $sink->get_events();
         $event = reset($events);
-        $this->assertInstanceOf('\tool_lp\event\plan_review_stopped', $event);
+        $this->assertInstanceOf('\core\event\competency_plan_review_stopped', $event);
         $this->assertEquals($planid, $event->objectid);
         $this->assertEquals($contextid, $event->contextid);
         $this->assertEquals($plan->get_userid(), $event->relateduserid);
@@ -1329,7 +1329,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = reset($events);
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\evidence_created', $event);
+        $this->assertInstanceOf('\core\event\competency_evidence_created', $event);
         $this->assertEquals($evidence->get_contextid(), $event->contextid);
         $this->assertEquals($evidence->get_id(), $event->objectid);
         $this->assertEquals($evidence->get_actionuserid(), $event->userid);
@@ -1385,7 +1385,7 @@ class tool_lp_event_testcase extends advanced_testcase {
 
         // We expect this to fail and throw a coding exception.
         $this->setExpectedException('coding_exception', 'The user competency linked with this evidence is invalid.');
-        \tool_lp\event\evidence_created::create_from_evidence($evidence, $otheruc, $recommend)->trigger();
+        \core\event\competency_evidence_created::create_from_evidence($evidence, $otheruc, $recommend)->trigger();
     }
 
     /**
@@ -1403,7 +1403,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // No relateduserid.
         $errormsg = 'The \'relateduserid\' must be set.';
         try {
-            \tool_lp\event\evidence_created::create($eventdata)->trigger();
+            \core\event\competency_evidence_created::create($eventdata)->trigger();
             $this->fail('Coding exception should have been thrown: ' . $errormsg);
         } catch (coding_exception $e) {
             $this->assertContains($errormsg, $e->getMessage());
@@ -1413,7 +1413,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // No other['usercompetencyid'].
         $errormsg = 'The \'usercompetencyid\' data in \'other\' must be set.';
         try {
-            \tool_lp\event\evidence_created::create($eventdata)->trigger();
+            \core\event\competency_evidence_created::create($eventdata)->trigger();
             $this->fail('Coding exception should have been thrown: ' . $errormsg);
         } catch (coding_exception $e) {
             $this->assertContains($errormsg, $e->getMessage());
@@ -1423,7 +1423,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // No other['competencyid'].
         $errormsg = 'The \'competencyid\' data in \'other\' must be set.';
         try {
-            \tool_lp\event\evidence_created::create($eventdata)->trigger();
+            \core\event\competency_evidence_created::create($eventdata)->trigger();
             $this->fail('Coding exception should have been thrown: ' . $errormsg);
         } catch (coding_exception $e) {
             $this->assertContains($errormsg, $e->getMessage());
@@ -1433,7 +1433,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // No other['action'].
         $errormsg = 'The \'action\' data in \'other\' must be set.';
         try {
-            \tool_lp\event\evidence_created::create($eventdata)->trigger();
+            \core\event\competency_evidence_created::create($eventdata)->trigger();
             $this->fail('Coding exception should have been thrown: ' . $errormsg);
         } catch (coding_exception $e) {
             $this->assertContains($errormsg, $e->getMessage());
@@ -1443,7 +1443,7 @@ class tool_lp_event_testcase extends advanced_testcase {
         // No other['recommend'].
         $errormsg = 'The \'recommend\' data in \'other\' must be set.';
         try {
-            \tool_lp\event\evidence_created::create($eventdata)->trigger();
+            \core\event\competency_evidence_created::create($eventdata)->trigger();
             $this->fail('Coding exception should have been thrown: ' . $errormsg);
         } catch (coding_exception $e) {
             $this->assertContains($errormsg, $e->getMessage());
@@ -1451,14 +1451,14 @@ class tool_lp_event_testcase extends advanced_testcase {
         $eventdata['other']['recommend'] = 1;
 
         // Event should be triggered without any problems.
-        \tool_lp\event\evidence_created::create($eventdata)->trigger();
+        \core\event\competency_evidence_created::create($eventdata)->trigger();
     }
 
     /**
      * Test the user competency grade rated event.
      *
      */
-    public function test_user_competency_grade_rated() {
+    public function test_user_competency_rated() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
@@ -1493,8 +1493,8 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = $events[1];
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\evidence_created', $evidencecreatedevent);
-        $this->assertInstanceOf('\tool_lp\event\user_competency_grade_rated', $event);
+        $this->assertInstanceOf('\core\event\competency_evidence_created', $evidencecreatedevent);
+        $this->assertInstanceOf('\core\event\competency_user_competency_rated', $event);
         $this->assertEquals($uc->get_id(), $event->objectid);
         $this->assertEquals($uc->get_context()->id, $event->contextid);
         $this->assertEquals($uc->get_userid(), $event->relateduserid);
@@ -1507,7 +1507,7 @@ class tool_lp_event_testcase extends advanced_testcase {
      * Test the user competency grade rated in course event.
      *
      */
-    public function test_user_competency_grade_rated_in_course() {
+    public function test_user_competency_rated_in_course() {
         $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
@@ -1549,8 +1549,8 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = $events[1];
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\evidence_created', $evidencecreatedevent);
-        $this->assertInstanceOf('\tool_lp\event\user_competency_grade_rated_in_course', $event);
+        $this->assertInstanceOf('\core\event\competency_evidence_created', $evidencecreatedevent);
+        $this->assertInstanceOf('\core\event\competency_user_competency_rated_in_course', $event);
         $this->assertEquals(context_course::instance($course->id)->id, $event->contextid);
         $this->assertEquals($course->id, $event->courseid);
         $this->assertEquals($uc->get_userid(), $event->relateduserid);
@@ -1564,7 +1564,7 @@ class tool_lp_event_testcase extends advanced_testcase {
      * Test the user competency grade rated in plan event.
      *
      */
-    public function test_user_competency_grade_rated_in_plan() {
+    public function test_user_competency_rated_in_plan() {
          $this->resetAfterTest(true);
         $this->setAdminUser();
         $dg = $this->getDataGenerator();
@@ -1600,8 +1600,8 @@ class tool_lp_event_testcase extends advanced_testcase {
         $event = $events[1];
 
         // Check that the event data is valid.
-        $this->assertInstanceOf('\tool_lp\event\evidence_created', $evidencecreatedevent);
-        $this->assertInstanceOf('\tool_lp\event\user_competency_grade_rated_in_plan', $event);
+        $this->assertInstanceOf('\core\event\competency_evidence_created', $evidencecreatedevent);
+        $this->assertInstanceOf('\core\event\competency_user_competency_rated_in_plan', $event);
         $this->assertEquals($uc->get_id(), $event->objectid);
         $this->assertEquals($uc->get_context()->id, $event->contextid);
         $this->assertEquals($uc->get_userid(), $event->relateduserid);
diff --git a/competency/tests/user_evidence_competency_test.php b/competency/tests/user_evidence_competency_test.php
index 051205dbdb0..fe892ed9808 100644
--- a/competency/tests/user_evidence_competency_test.php
+++ b/competency/tests/user_evidence_competency_test.php
@@ -34,7 +34,7 @@ use core_competency\user_evidence_competency;
  * @copyright  2016 Serge Gauthier - <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_competency_user_evidene_competency_testcase extends advanced_testcase {
+class core_competency_user_evidence_competency_testcase extends advanced_testcase {
 
     public function test_get_user_competencies_by_userevidenceid() {
         global $CFG, $DB;
diff --git a/admin/tool/lp/classes/event/competency_created.php b/lib/classes/event/competency_created.php
similarity index 97%
rename from admin/tool/lp/classes/event/competency_created.php
rename to lib/classes/event/competency_created.php
index ed7886e0bcb..3892d2c5379 100644
--- a/admin/tool/lp/classes/event/competency_created.php
+++ b/lib/classes/event/competency_created.php
@@ -17,12 +17,12 @@
 /**
  * Competency created event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\competency;
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * Competency created event class.
  *
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/admin/tool/lp/classes/event/competency_deleted.php b/lib/classes/event/competency_deleted.php
similarity index 97%
rename from admin/tool/lp/classes/event/competency_deleted.php
rename to lib/classes/event/competency_deleted.php
index de2329ec5f6..9830c00092f 100644
--- a/admin/tool/lp/classes/event/competency_deleted.php
+++ b/lib/classes/event/competency_deleted.php
@@ -17,12 +17,12 @@
 /**
  * Competency deleted event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\competency;
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Competency deleted event class.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/admin/tool/lp/classes/event/evidence_created.php b/lib/classes/event/competency_evidence_created.php
similarity index 98%
rename from admin/tool/lp/classes/event/evidence_created.php
rename to lib/classes/event/competency_evidence_created.php
index 46004aff36b..c58132c8454 100644
--- a/admin/tool/lp/classes/event/evidence_created.php
+++ b/lib/classes/event/competency_evidence_created.php
@@ -21,7 +21,7 @@
  * @copyright  2016 Jun Pataleta <jun@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\evidence;
@@ -46,7 +46,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2016 Jun Pataleta <jun@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class evidence_created extends base {
+class competency_evidence_created extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/competency_framework_created.php b/lib/classes/event/competency_framework_created.php
similarity index 94%
rename from admin/tool/lp/classes/event/competency_framework_created.php
rename to lib/classes/event/competency_framework_created.php
index e57dd9e0a13..eeab7ddb330 100644
--- a/admin/tool/lp/classes/event/competency_framework_created.php
+++ b/lib/classes/event/competency_framework_created.php
@@ -17,11 +17,11 @@
 /**
  * Competency framework created event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\competency_framework;
@@ -35,7 +35,7 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -84,8 +84,8 @@ class competency_framework_created extends base {
      * @return \moodle_url
      */
     public function get_url() {
-        return new \moodle_url('/admin/tool/lp/editcompetencyframework.php',
-                               array('id' => $this->objectid, 'pagecontextid' => $this->contextid));
+        return new \moodle_url('/admin/tool/lp/editcompetencyframework.php', array(
+            'id' => $this->objectid, 'pagecontextid' => $this->contextid));
     }
 
     /**
diff --git a/admin/tool/lp/classes/event/competency_framework_deleted.php b/lib/classes/event/competency_framework_deleted.php
similarity index 97%
rename from admin/tool/lp/classes/event/competency_framework_deleted.php
rename to lib/classes/event/competency_framework_deleted.php
index 8f86d6ae1cb..786bbc1cb67 100644
--- a/admin/tool/lp/classes/event/competency_framework_deleted.php
+++ b/lib/classes/event/competency_framework_deleted.php
@@ -17,12 +17,12 @@
 /**
  * Competency framework deleted event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\competency_framework;
@@ -36,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/admin/tool/lp/classes/event/competency_framework_updated.php b/lib/classes/event/competency_framework_updated.php
similarity index 97%
rename from admin/tool/lp/classes/event/competency_framework_updated.php
rename to lib/classes/event/competency_framework_updated.php
index d2c7230aa48..8951ef388c0 100644
--- a/admin/tool/lp/classes/event/competency_framework_updated.php
+++ b/lib/classes/event/competency_framework_updated.php
@@ -17,12 +17,12 @@
 /**
  * Competency framework updated event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\competency_framework;
@@ -36,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/admin/tool/lp/classes/event/competency_framework_viewed.php b/lib/classes/event/competency_framework_viewed.php
similarity index 97%
rename from admin/tool/lp/classes/event/competency_framework_viewed.php
rename to lib/classes/event/competency_framework_viewed.php
index 1784c50048a..0aa3a06adb8 100644
--- a/admin/tool/lp/classes/event/competency_framework_viewed.php
+++ b/lib/classes/event/competency_framework_viewed.php
@@ -17,12 +17,12 @@
 /**
  * Competency framework viewed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\competency_framework;
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Competency framework viewed event class.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/admin/tool/lp/classes/event/plan_approved.php b/lib/classes/event/competency_plan_approved.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_approved.php
rename to lib/classes/event/competency_plan_approved.php
index 5d379728afa..18d56b7043d 100644
--- a/admin/tool/lp/classes/event/plan_approved.php
+++ b/lib/classes/event/competency_plan_approved.php
@@ -17,12 +17,12 @@
 /**
  * Plan approved event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_approved extends base {
+class competency_plan_approved extends base {
 
     /**
      * Convenience method to instantiate the plan approved event.
diff --git a/admin/tool/lp/classes/event/plan_completed.php b/lib/classes/event/competency_plan_completed.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_completed.php
rename to lib/classes/event/competency_plan_completed.php
index 11513d537ec..05dbac30af1 100644
--- a/admin/tool/lp/classes/event/plan_completed.php
+++ b/lib/classes/event/competency_plan_completed.php
@@ -17,12 +17,12 @@
 /**
  * Plan completed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_completed extends base {
+class competency_plan_completed extends base {
 
     /**
      * Convenience method to instantiate the plan completed event.
diff --git a/admin/tool/lp/classes/event/plan_created.php b/lib/classes/event/competency_plan_created.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_created.php
rename to lib/classes/event/competency_plan_created.php
index d8e0765bf1a..3d444015322 100644
--- a/admin/tool/lp/classes/event/plan_created.php
+++ b/lib/classes/event/competency_plan_created.php
@@ -17,11 +17,11 @@
 /**
  * Plan created event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -35,12 +35,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_created extends base {
+class competency_plan_created extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/plan_deleted.php b/lib/classes/event/competency_plan_deleted.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_deleted.php
rename to lib/classes/event/competency_plan_deleted.php
index 69d729927e8..5a93faf5aa5 100644
--- a/admin/tool/lp/classes/event/plan_deleted.php
+++ b/lib/classes/event/competency_plan_deleted.php
@@ -17,12 +17,12 @@
 /**
  * Plan deleted event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_deleted extends base {
+class competency_plan_deleted extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/plan_reopened.php b/lib/classes/event/competency_plan_reopened.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_reopened.php
rename to lib/classes/event/competency_plan_reopened.php
index 761a2b9e971..472abd85ab4 100644
--- a/admin/tool/lp/classes/event/plan_reopened.php
+++ b/lib/classes/event/competency_plan_reopened.php
@@ -17,12 +17,12 @@
 /**
  * Plan reopened event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_reopened extends base {
+class competency_plan_reopened extends base {
 
     /**
      * Convenience method to instantiate the plan reopened event.
diff --git a/admin/tool/lp/classes/event/plan_review_request_cancelled.php b/lib/classes/event/competency_plan_review_request_cancelled.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_review_request_cancelled.php
rename to lib/classes/event/competency_plan_review_request_cancelled.php
index d4f6fc103d2..bfa2dea719c 100644
--- a/admin/tool/lp/classes/event/plan_review_request_cancelled.php
+++ b/lib/classes/event/competency_plan_review_request_cancelled.php
@@ -17,12 +17,12 @@
 /**
  * Plan review request cancelled  event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_review_request_cancelled extends base {
+class competency_plan_review_request_cancelled extends base {
 
     /**
      * Convenience method to instantiate the plan review request cancelled event.
diff --git a/admin/tool/lp/classes/event/plan_review_requested.php b/lib/classes/event/competency_plan_review_requested.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_review_requested.php
rename to lib/classes/event/competency_plan_review_requested.php
index 89d923a700b..734c92e9156 100644
--- a/admin/tool/lp/classes/event/plan_review_requested.php
+++ b/lib/classes/event/competency_plan_review_requested.php
@@ -17,12 +17,12 @@
 /**
  * Plan review requested event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_review_requested extends base {
+class competency_plan_review_requested extends base {
 
     /**
      * Convenience method to instantiate the plan review requested event.
diff --git a/admin/tool/lp/classes/event/plan_review_started.php b/lib/classes/event/competency_plan_review_started.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_review_started.php
rename to lib/classes/event/competency_plan_review_started.php
index 327c0f750b9..0ac4901229d 100644
--- a/admin/tool/lp/classes/event/plan_review_started.php
+++ b/lib/classes/event/competency_plan_review_started.php
@@ -17,12 +17,12 @@
 /**
  * Plan review started event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_review_started extends base {
+class competency_plan_review_started extends base {
 
     /**
      * Convenience method to instantiate the plan review started event.
diff --git a/admin/tool/lp/classes/event/plan_review_stopped.php b/lib/classes/event/competency_plan_review_stopped.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_review_stopped.php
rename to lib/classes/event/competency_plan_review_stopped.php
index 620e04065c0..a79f9545f9d 100644
--- a/admin/tool/lp/classes/event/plan_review_stopped.php
+++ b/lib/classes/event/competency_plan_review_stopped.php
@@ -17,12 +17,12 @@
 /**
  * Plan review stopped event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_review_stopped extends base {
+class competency_plan_review_stopped extends base {
 
     /**
      * Convenience method to instantiate the plan review stopped event.
diff --git a/admin/tool/lp/classes/event/plan_unapproved.php b/lib/classes/event/competency_plan_unapproved.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_unapproved.php
rename to lib/classes/event/competency_plan_unapproved.php
index 592dc30c2e5..576ab8ead6c 100644
--- a/admin/tool/lp/classes/event/plan_unapproved.php
+++ b/lib/classes/event/competency_plan_unapproved.php
@@ -17,12 +17,12 @@
 /**
  * Plan unapproved event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_unapproved extends base {
+class competency_plan_unapproved extends base {
 
     /**
      * Convenience method to instantiate the plan unapproved event.
diff --git a/admin/tool/lp/classes/event/plan_unlinked.php b/lib/classes/event/competency_plan_unlinked.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_unlinked.php
rename to lib/classes/event/competency_plan_unlinked.php
index 3906153a0f4..644d6f4de0f 100644
--- a/admin/tool/lp/classes/event/plan_unlinked.php
+++ b/lib/classes/event/competency_plan_unlinked.php
@@ -17,12 +17,12 @@
 /**
  * Plan unlinked event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -33,12 +33,12 @@ defined('MOODLE_INTERNAL') || die();
  * Plan unlinked event class.
  *
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_unlinked extends base {
+class competency_plan_unlinked extends base {
 
     /**
      * Convenience method to instantiate the plan unlinked event.
diff --git a/admin/tool/lp/classes/event/plan_updated.php b/lib/classes/event/competency_plan_updated.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_updated.php
rename to lib/classes/event/competency_plan_updated.php
index 4e33348bf55..3a268421847 100644
--- a/admin/tool/lp/classes/event/plan_updated.php
+++ b/lib/classes/event/competency_plan_updated.php
@@ -17,12 +17,12 @@
 /**
  * Plan updated event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_updated extends base {
+class competency_plan_updated extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/plan_viewed.php b/lib/classes/event/competency_plan_viewed.php
similarity index 95%
rename from admin/tool/lp/classes/event/plan_viewed.php
rename to lib/classes/event/competency_plan_viewed.php
index 95a3b7ab60d..1c89e7d1483 100644
--- a/admin/tool/lp/classes/event/plan_viewed.php
+++ b/lib/classes/event/competency_plan_viewed.php
@@ -17,11 +17,11 @@
 /**
  * Plan viewed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\plan;
@@ -35,12 +35,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class plan_viewed extends base {
+class competency_plan_viewed extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/template_created.php b/lib/classes/event/competency_template_created.php
similarity index 95%
rename from admin/tool/lp/classes/event/template_created.php
rename to lib/classes/event/competency_template_created.php
index af2677de101..5b02bfc1e87 100644
--- a/admin/tool/lp/classes/event/template_created.php
+++ b/lib/classes/event/competency_template_created.php
@@ -17,11 +17,11 @@
 /**
  * Template created event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\template;
@@ -35,12 +35,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class template_created extends base {
+class competency_template_created extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/template_deleted.php b/lib/classes/event/competency_template_deleted.php
similarity index 95%
rename from admin/tool/lp/classes/event/template_deleted.php
rename to lib/classes/event/competency_template_deleted.php
index 998863482c9..82e390f0afe 100644
--- a/admin/tool/lp/classes/event/template_deleted.php
+++ b/lib/classes/event/competency_template_deleted.php
@@ -17,12 +17,12 @@
 /**
  * Template deleted event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\template;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class template_deleted extends base {
+class competency_template_deleted extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/template_updated.php b/lib/classes/event/competency_template_updated.php
similarity index 95%
rename from admin/tool/lp/classes/event/template_updated.php
rename to lib/classes/event/competency_template_updated.php
index 2f30f798d29..321bb1ee087 100644
--- a/admin/tool/lp/classes/event/template_updated.php
+++ b/lib/classes/event/competency_template_updated.php
@@ -17,12 +17,12 @@
 /**
  * Template updated event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\template;
@@ -36,12 +36,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class template_updated extends base {
+class competency_template_updated extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/template_viewed.php b/lib/classes/event/competency_template_viewed.php
similarity index 95%
rename from admin/tool/lp/classes/event/template_viewed.php
rename to lib/classes/event/competency_template_viewed.php
index 148de11b6d4..036da339f06 100644
--- a/admin/tool/lp/classes/event/template_viewed.php
+++ b/lib/classes/event/competency_template_viewed.php
@@ -17,11 +17,11 @@
 /**
  * Template viewed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\template;
@@ -35,12 +35,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class template_viewed extends base {
+class competency_template_viewed extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/competency_updated.php b/lib/classes/event/competency_updated.php
similarity index 97%
rename from admin/tool/lp/classes/event/competency_updated.php
rename to lib/classes/event/competency_updated.php
index d8f1b717c97..16f01d7716f 100644
--- a/admin/tool/lp/classes/event/competency_updated.php
+++ b/lib/classes/event/competency_updated.php
@@ -17,12 +17,12 @@
 /**
  * Competency updated event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\competency;
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * Competency updated event class.
  *
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/admin/tool/lp/classes/event/user_competency_plan_viewed.php b/lib/classes/event/competency_user_competency_plan_viewed.php
similarity index 96%
rename from admin/tool/lp/classes/event/user_competency_plan_viewed.php
rename to lib/classes/event/competency_user_competency_plan_viewed.php
index 682a6ad7178..36b68061a99 100644
--- a/admin/tool/lp/classes/event/user_competency_plan_viewed.php
+++ b/lib/classes/event/competency_user_competency_plan_viewed.php
@@ -17,12 +17,12 @@
 /**
  * User competency plan viewed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency_plan;
@@ -39,12 +39,12 @@ defined('MOODLE_INTERNAL') || die();
  *      - int competencyid: id of the competency.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_plan_viewed extends base {
+class competency_user_competency_plan_viewed extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_grade_rated.php b/lib/classes/event/competency_user_competency_rated.php
similarity index 96%
rename from admin/tool/lp/classes/event/user_competency_grade_rated.php
rename to lib/classes/event/competency_user_competency_rated.php
index 1ff190511bb..8dfe7ec06db 100644
--- a/admin/tool/lp/classes/event/user_competency_grade_rated.php
+++ b/lib/classes/event/competency_user_competency_rated.php
@@ -17,12 +17,12 @@
 /**
  * User competency grade rated event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency;
@@ -37,12 +37,12 @@ defined('MOODLE_INTERNAL') || die();
  *      - int grade: grade name of the user competency
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_grade_rated extends base {
+class competency_user_competency_rated extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_grade_rated_in_course.php b/lib/classes/event/competency_user_competency_rated_in_course.php
similarity index 96%
rename from admin/tool/lp/classes/event/user_competency_grade_rated_in_course.php
rename to lib/classes/event/competency_user_competency_rated_in_course.php
index 23183fb19d6..f8adb676525 100644
--- a/admin/tool/lp/classes/event/user_competency_grade_rated_in_course.php
+++ b/lib/classes/event/competency_user_competency_rated_in_course.php
@@ -17,12 +17,12 @@
 /**
  * User competency grade rated in course event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency_course;
@@ -39,12 +39,12 @@ defined('MOODLE_INTERNAL') || die();
  *      - int grade: grade name of the user competency
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_grade_rated_in_course extends base {
+class competency_user_competency_rated_in_course extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_grade_rated_in_plan.php b/lib/classes/event/competency_user_competency_rated_in_plan.php
similarity index 96%
rename from admin/tool/lp/classes/event/user_competency_grade_rated_in_plan.php
rename to lib/classes/event/competency_user_competency_rated_in_plan.php
index c77d99954dd..a8b16c5643d 100644
--- a/admin/tool/lp/classes/event/user_competency_grade_rated_in_plan.php
+++ b/lib/classes/event/competency_user_competency_rated_in_plan.php
@@ -17,12 +17,12 @@
 /**
  * User competency grade rated in course event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency;
@@ -39,12 +39,12 @@ defined('MOODLE_INTERNAL') || die();
  *      - int planid: the plan id
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_grade_rated_in_plan extends base {
+class competency_user_competency_rated_in_plan extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_review_request_cancelled.php b/lib/classes/event/competency_user_competency_review_request_cancelled.php
similarity index 95%
rename from admin/tool/lp/classes/event/user_competency_review_request_cancelled.php
rename to lib/classes/event/competency_user_competency_review_request_cancelled.php
index 4f3af23239d..2a30dd386cb 100644
--- a/admin/tool/lp/classes/event/user_competency_review_request_cancelled.php
+++ b/lib/classes/event/competency_user_competency_review_request_cancelled.php
@@ -17,12 +17,12 @@
 /**
  * User competency review requested event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency;
@@ -32,12 +32,12 @@ defined('MOODLE_INTERNAL') || die();
  * User competency review requested event class.
  *
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_review_request_cancelled extends base {
+class competency_user_competency_review_request_cancelled extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_review_requested.php b/lib/classes/event/competency_user_competency_review_requested.php
similarity index 95%
rename from admin/tool/lp/classes/event/user_competency_review_requested.php
rename to lib/classes/event/competency_user_competency_review_requested.php
index 6dae1944aa6..3ff936d33c4 100644
--- a/admin/tool/lp/classes/event/user_competency_review_requested.php
+++ b/lib/classes/event/competency_user_competency_review_requested.php
@@ -17,12 +17,12 @@
 /**
  * User competency review requested event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency;
@@ -32,12 +32,12 @@ defined('MOODLE_INTERNAL') || die();
  * User competency review requested event class.
  *
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_review_requested extends base {
+class competency_user_competency_review_requested extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_review_started.php b/lib/classes/event/competency_user_competency_review_started.php
similarity index 95%
rename from admin/tool/lp/classes/event/user_competency_review_started.php
rename to lib/classes/event/competency_user_competency_review_started.php
index 86f87ff6d4b..79c792216e6 100644
--- a/admin/tool/lp/classes/event/user_competency_review_started.php
+++ b/lib/classes/event/competency_user_competency_review_started.php
@@ -17,12 +17,12 @@
 /**
  * User competency review started event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency;
@@ -32,12 +32,12 @@ defined('MOODLE_INTERNAL') || die();
  * User competency review started event class.
  *
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_review_started extends base {
+class competency_user_competency_review_started extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_review_stopped.php b/lib/classes/event/competency_user_competency_review_stopped.php
similarity index 95%
rename from admin/tool/lp/classes/event/user_competency_review_stopped.php
rename to lib/classes/event/competency_user_competency_review_stopped.php
index e883b259a75..37cda3c5221 100644
--- a/admin/tool/lp/classes/event/user_competency_review_stopped.php
+++ b/lib/classes/event/competency_user_competency_review_stopped.php
@@ -17,12 +17,12 @@
 /**
  * User competency review stopped event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency;
@@ -32,12 +32,12 @@ defined('MOODLE_INTERNAL') || die();
  * User competency review stopped event class.
  *
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_review_stopped extends base {
+class competency_user_competency_review_stopped extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_viewed.php b/lib/classes/event/competency_user_competency_viewed.php
similarity index 96%
rename from admin/tool/lp/classes/event/user_competency_viewed.php
rename to lib/classes/event/competency_user_competency_viewed.php
index 7f2cff76ff1..30c87848170 100644
--- a/admin/tool/lp/classes/event/user_competency_viewed.php
+++ b/lib/classes/event/competency_user_competency_viewed.php
@@ -17,12 +17,12 @@
 /**
  * User competency viewed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency;
@@ -38,12 +38,12 @@ defined('MOODLE_INTERNAL') || die();
  *      - int competencyid: id of competency.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_viewed extends base {
+class competency_user_competency_viewed extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_competency_viewed_in_course.php b/lib/classes/event/competency_user_competency_viewed_in_course.php
similarity index 96%
rename from admin/tool/lp/classes/event/user_competency_viewed_in_course.php
rename to lib/classes/event/competency_user_competency_viewed_in_course.php
index e6529ab852e..c172e241a34 100644
--- a/admin/tool/lp/classes/event/user_competency_viewed_in_course.php
+++ b/lib/classes/event/competency_user_competency_viewed_in_course.php
@@ -17,12 +17,12 @@
 /**
  * User competency viewed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency_course;
@@ -38,12 +38,12 @@ defined('MOODLE_INTERNAL') || die();
  *      - int competencyid: id of competency.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_viewed_in_course extends base {
+class competency_user_competency_viewed_in_course extends base {
 
     /**
      * Convenience method to instantiate the event in course.
diff --git a/admin/tool/lp/classes/event/user_competency_viewed_in_plan.php b/lib/classes/event/competency_user_competency_viewed_in_plan.php
similarity index 96%
rename from admin/tool/lp/classes/event/user_competency_viewed_in_plan.php
rename to lib/classes/event/competency_user_competency_viewed_in_plan.php
index 5cb17c90b20..b833a357dc1 100644
--- a/admin/tool/lp/classes/event/user_competency_viewed_in_plan.php
+++ b/lib/classes/event/competency_user_competency_viewed_in_plan.php
@@ -17,12 +17,12 @@
 /**
  * User competency viewed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_competency;
@@ -39,12 +39,12 @@ defined('MOODLE_INTERNAL') || die();
  *      - int competencyid: id of competency.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_competency_viewed_in_plan extends base {
+class competency_user_competency_viewed_in_plan extends base {
 
     /**
      * Convenience method to instantiate the event in plan.
diff --git a/admin/tool/lp/classes/event/user_evidence_created.php b/lib/classes/event/competency_user_evidence_created.php
similarity index 95%
rename from admin/tool/lp/classes/event/user_evidence_created.php
rename to lib/classes/event/competency_user_evidence_created.php
index d1495a5dbc3..c3857bc80bb 100644
--- a/admin/tool/lp/classes/event/user_evidence_created.php
+++ b/lib/classes/event/competency_user_evidence_created.php
@@ -17,11 +17,11 @@
 /**
  * Evidence of prior learning created event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_evidence;
@@ -35,12 +35,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_evidence_created extends base {
+class competency_user_evidence_created extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_evidence_deleted.php b/lib/classes/event/competency_user_evidence_deleted.php
similarity index 95%
rename from admin/tool/lp/classes/event/user_evidence_deleted.php
rename to lib/classes/event/competency_user_evidence_deleted.php
index 25fdad153db..47424c8443b 100644
--- a/admin/tool/lp/classes/event/user_evidence_deleted.php
+++ b/lib/classes/event/competency_user_evidence_deleted.php
@@ -17,11 +17,11 @@
 /**
  * Evidence of prior learning deleted event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_evidence;
@@ -35,12 +35,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_evidence_deleted extends base {
+class competency_user_evidence_deleted extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/user_evidence_updated.php b/lib/classes/event/competency_user_evidence_updated.php
similarity index 95%
rename from admin/tool/lp/classes/event/user_evidence_updated.php
rename to lib/classes/event/competency_user_evidence_updated.php
index 1873d6a439f..c17040e54a7 100644
--- a/admin/tool/lp/classes/event/user_evidence_updated.php
+++ b/lib/classes/event/competency_user_evidence_updated.php
@@ -17,11 +17,11 @@
 /**
  * Evidence of prior learning updated event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\user_evidence;
@@ -35,12 +35,12 @@ defined('MOODLE_INTERNAL') || die();
  *      Extra information about event.
  * }
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Serge Gauthier <serge.gauthier.2@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_evidence_updated extends base {
+class competency_user_evidence_updated extends base {
 
     /**
      * Convenience method to instantiate the event.
diff --git a/admin/tool/lp/classes/event/competency_viewed.php b/lib/classes/event/competency_viewed.php
similarity index 97%
rename from admin/tool/lp/classes/event/competency_viewed.php
rename to lib/classes/event/competency_viewed.php
index a9def689f51..fe6d7c1bbf5 100644
--- a/admin/tool/lp/classes/event/competency_viewed.php
+++ b/lib/classes/event/competency_viewed.php
@@ -17,12 +17,12 @@
 /**
  * Competency viewed event.
  *
- * @package    tool_lp
+ * @package    core_competency
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_lp\event;
+namespace core\event;
 
 use core\event\base;
 use core_competency\competency;
@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
  * Competency viewed event class.
  *
  *
- * @package    tool_lp
+ * @package    core_competency
  * @since      Moodle 3.1
  * @copyright  2016 Issam Taboubi <issam.taboubi@umontreal.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later