diff --git a/completion/completion_criteria.php b/completion/criteria/completion_criteria.php
similarity index 99%
rename from completion/completion_criteria.php
rename to completion/criteria/completion_criteria.php
index d597b44decb..a87abd3d676 100644
--- a/completion/completion_criteria.php
+++ b/completion/criteria/completion_criteria.php
@@ -172,7 +172,7 @@ abstract class completion_criteria extends data_object {
         }
 
         $class = 'completion_criteria_'.$COMPLETION_CRITERIA_TYPES[$params['criteriatype']];
-        require_once($CFG->dirroot.'/completion/'.$class.'.php');
+        require_once($CFG->dirroot.'/completion/criteria/'.$class.'.php');
 
         return new $class($params, false);
     }
diff --git a/completion/completion_criteria_activity.php b/completion/criteria/completion_criteria_activity.php
similarity index 100%
rename from completion/completion_criteria_activity.php
rename to completion/criteria/completion_criteria_activity.php
diff --git a/completion/completion_criteria_course.php b/completion/criteria/completion_criteria_course.php
similarity index 100%
rename from completion/completion_criteria_course.php
rename to completion/criteria/completion_criteria_course.php
diff --git a/completion/completion_criteria_date.php b/completion/criteria/completion_criteria_date.php
similarity index 100%
rename from completion/completion_criteria_date.php
rename to completion/criteria/completion_criteria_date.php
diff --git a/completion/completion_criteria_duration.php b/completion/criteria/completion_criteria_duration.php
similarity index 100%
rename from completion/completion_criteria_duration.php
rename to completion/criteria/completion_criteria_duration.php
diff --git a/completion/completion_criteria_grade.php b/completion/criteria/completion_criteria_grade.php
similarity index 100%
rename from completion/completion_criteria_grade.php
rename to completion/criteria/completion_criteria_grade.php
diff --git a/completion/completion_criteria_role.php b/completion/criteria/completion_criteria_role.php
similarity index 100%
rename from completion/completion_criteria_role.php
rename to completion/criteria/completion_criteria_role.php
diff --git a/completion/completion_criteria_self.php b/completion/criteria/completion_criteria_self.php
similarity index 100%
rename from completion/completion_criteria_self.php
rename to completion/criteria/completion_criteria_self.php
diff --git a/completion/completion_criteria_unenrol.php b/completion/criteria/completion_criteria_unenrol.php
similarity index 100%
rename from completion/completion_criteria_unenrol.php
rename to completion/criteria/completion_criteria_unenrol.php
diff --git a/completion/cron.php b/completion/cron.php
index 038577935bd..8f5ea24ab3d 100644
--- a/completion/cron.php
+++ b/completion/cron.php
@@ -207,7 +207,7 @@ function completion_cron_criteria() {
     foreach ($COMPLETION_CRITERIA_TYPES as $type) {
 
         $object = 'completion_criteria_'.$type;
-        require_once 'completion/'.$object.'.php';
+        require_once $CFG->dirroot.'/completion/criteria/'.$object.'.php';
 
         $class = new $object();
 
diff --git a/course/completion.php b/course/completion.php
index 2a4d77a458f..6b38a889c3d 100644
--- a/course/completion.php
+++ b/course/completion.php
@@ -28,14 +28,14 @@
 require_once('../config.php');
 require_once('lib.php');
 require_once($CFG->libdir.'/completionlib.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_self.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_date.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_unenrol.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_activity.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_duration.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_grade.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_role.php');
-require_once($CFG->dirroot.'/completion/completion_criteria_course.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_self.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_date.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_unenrol.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_activity.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_duration.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_grade.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_role.php');
+require_once($CFG->dirroot.'/completion/criteria/completion_criteria_course.php');
 require_once $CFG->libdir.'/gradelib.php';
 require_once('completion_form.php');
 
diff --git a/lib/completionlib.php b/lib/completionlib.php
index c26e49acaa9..c766b25e926 100644
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * Include the required completion libraries
  */
 require_once $CFG->dirroot.'/completion/completion_aggregation.php';
-require_once $CFG->dirroot.'/completion/completion_criteria.php';
+require_once $CFG->dirroot.'/completion/criteria/completion_criteria.php';
 require_once $CFG->dirroot.'/completion/completion_completion.php';
 require_once $CFG->dirroot.'/completion/completion_criteria_completion.php';
 
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 42d99027be8..5f998209551 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -405,7 +405,7 @@ function xmldb_main_upgrade($oldversion) {
     }
 
     if ($oldversion < 2012042300.02) {
-        require_once($CFG->dirroot.'/completion/completion_criteria.php');
+        require_once($CFG->dirroot.'/completion/criteria/completion_criteria.php');
         // Delete orphaned criteria which were left when modules were removed
         if ($DB->get_dbfamily() === 'mysql') {
             $sql = "DELETE cc FROM {course_completion_criteria} cc