From aaae75b04f2af37529f2977e7457e2c25393eb65 Mon Sep 17 00:00:00 2001
From: gustav_delius <gustav_delius>
Date: Fri, 24 Mar 2006 19:54:13 +0000
Subject: [PATCH] Renaming question/questiontypes/ to question/types/ as
 requested by Martin

---
 lib/questionlib.php                                 |   2 +-
 question/format/qti2/qt_common.php                  |   4 ++--
 question/question.php                               |   2 +-
 .../{questiontypes => type}/calculated/db/mysql.php |   2 +-
 .../{questiontypes => type}/calculated/db/mysql.sql |   0
 .../calculated/db/postgre7.php                      |   2 +-
 .../calculated/db/postgre7.sql                      |   0
 .../calculated/editquestion.html                    |   0
 .../calculated/editquestion.php                     |   2 +-
 .../{questiontypes => type}/calculated/icon.gif     | Bin
 .../calculated/questiontype.php                     |   4 ++--
 .../{questiontypes => type}/calculated/version.php  |   0
 .../datasetdependent/abstractqtype.php              |   4 ++--
 .../datasetdependent/categorydatasetdefinitions.php |   0
 .../datasetdependent/datasetdefinitions.php         |   2 +-
 .../datasetdependent/datasetitems.php               |   0
 .../datasetdependent/questiondatasets.html          |   0
 .../description/editquestion.html                   |   0
 .../description/editquestion.php                    |   2 +-
 .../{questiontypes => type}/description/icon.gif    | Bin
 .../description/question.html                       |   0
 .../description/questiontype.php                    |   2 +-
 question/{questiontypes => type}/essay/db/mysql.php |   2 +-
 question/{questiontypes => type}/essay/db/mysql.sql |   0
 .../{questiontypes => type}/essay/db/postgre7.php   |   2 +-
 .../{questiontypes => type}/essay/db/postgre7.sql   |   0
 .../{questiontypes => type}/essay/editquestion.html |   0
 .../{questiontypes => type}/essay/editquestion.php  |   2 +-
 question/{questiontypes => type}/essay/icon.gif     | Bin
 .../{questiontypes => type}/essay/questiontype.php  |   0
 question/{questiontypes => type}/essay/version.php  |   0
 question/{questiontypes => type}/match/db/mysql.php |   2 +-
 question/{questiontypes => type}/match/db/mysql.sql |   0
 .../{questiontypes => type}/match/db/postgre7.php   |   2 +-
 .../{questiontypes => type}/match/db/postgre7.sql   |   0
 question/{questiontypes => type}/match/display.html |   0
 .../{questiontypes => type}/match/editquestion.html |   0
 .../{questiontypes => type}/match/editquestion.php  |   2 +-
 question/{questiontypes => type}/match/icon.gif     | Bin
 .../{questiontypes => type}/match/questiontype.php  |   2 +-
 question/{questiontypes => type}/match/version.php  |   0
 .../multianswer/db/mysql.php                        |   2 +-
 .../multianswer/db/mysql.sql                        |   0
 .../multianswer/db/postgre7.php                     |   2 +-
 .../multianswer/db/postgre7.sql                     |   0
 .../multianswer/editquestion.html                   |   0
 .../multianswer/editquestion.php                    |   2 +-
 .../{questiontypes => type}/multianswer/icon.gif    | Bin
 .../multianswer/questiontype.php                    |   0
 .../{questiontypes => type}/multianswer/version.php |   0
 .../multichoice/backuplib.php                       |   0
 .../multichoice/db/mysql.php                        |   2 +-
 .../multichoice/db/mysql.sql                        |   0
 .../multichoice/db/postgre7.php                     |   2 +-
 .../multichoice/db/postgre7.sql                     |   0
 .../multichoice/display.html                        |   0
 .../multichoice/editquestion.html                   |   0
 .../multichoice/editquestion.php                    |   2 +-
 .../{questiontypes => type}/multichoice/icon.gif    | Bin
 .../multichoice/questiontype.php                    |   2 +-
 .../{questiontypes => type}/multichoice/version.php |   0
 .../{questiontypes => type}/numerical/db/mysql.php  |   2 +-
 .../{questiontypes => type}/numerical/db/mysql.sql  |   0
 .../numerical/db/postgre7.php                       |   2 +-
 .../numerical/db/postgre7.sql                       |   0
 .../numerical/editquestion.html                     |   0
 .../numerical/editquestion.php                      |   2 +-
 question/{questiontypes => type}/numerical/icon.gif | Bin
 .../numerical/questiontype.php                      |   2 +-
 .../{questiontypes => type}/numerical/version.php   |   0
 question/{questiontypes => type}/question.html      |   0
 question/{questiontypes => type}/questiontype.php   |   4 ++--
 .../random/editquestion.html                        |   0
 .../{questiontypes => type}/random/editquestion.php |   2 +-
 question/{questiontypes => type}/random/icon.gif    | Bin
 .../{questiontypes => type}/random/questiontype.php |   0
 .../randomsamatch/db/mysql.php                      |   2 +-
 .../randomsamatch/db/mysql.sql                      |   0
 .../randomsamatch/db/postgre7.php                   |   2 +-
 .../randomsamatch/db/postgre7.sql                   |   0
 .../randomsamatch/editquestion.html                 |   0
 .../randomsamatch/editquestion.php                  |   2 +-
 .../{questiontypes => type}/randomsamatch/icon.gif  | Bin
 .../randomsamatch/questiontype.php                  |   0
 .../randomsamatch/version.php                       |   0
 question/{questiontypes => type}/rqp/db/mysql.php   |   2 +-
 question/{questiontypes => type}/rqp/db/mysql.sql   |   0
 .../{questiontypes => type}/rqp/db/postgre7.php     |   2 +-
 .../{questiontypes => type}/rqp/db/postgre7.sql     |   0
 .../{questiontypes => type}/rqp/editquestion.html   |   0
 .../{questiontypes => type}/rqp/editquestion.php    |   2 +-
 question/{questiontypes => type}/rqp/icon.gif       | Bin
 question/{questiontypes => type}/rqp/lib.php        |   0
 .../{questiontypes => type}/rqp/questiontype.php    |   4 ++--
 question/{questiontypes => type}/rqp/remote.php     |   2 +-
 question/{questiontypes => type}/rqp/rqp.php        |   0
 question/{questiontypes => type}/rqp/types.php      |   6 +++---
 question/{questiontypes => type}/rqp/version.php    |   0
 .../shortanswer/backuplib.php                       |   0
 .../shortanswer/db/mysql.php                        |   2 +-
 .../shortanswer/db/mysql.sql                        |   0
 .../shortanswer/db/postgre7.php                     |   2 +-
 .../shortanswer/db/postgre7.sql                     |   0
 .../shortanswer/display.html                        |   0
 .../shortanswer/editquestion.html                   |   0
 .../shortanswer/editquestion.php                    |   2 +-
 .../{questiontypes => type}/shortanswer/icon.gif    | Bin
 .../shortanswer/questiontype.php                    |   2 +-
 .../{questiontypes => type}/shortanswer/version.php |   0
 .../{questiontypes => type}/truefalse/db/mysql.php  |   2 +-
 .../{questiontypes => type}/truefalse/db/mysql.sql  |   0
 .../truefalse/db/postgre7.php                       |   2 +-
 .../truefalse/db/postgre7.sql                       |   0
 .../{questiontypes => type}/truefalse/display.html  |   0
 .../truefalse/editquestion.html                     |   0
 .../truefalse/editquestion.php                      |   2 +-
 question/{questiontypes => type}/truefalse/icon.gif | Bin
 .../truefalse/questiontype.php                      |   2 +-
 .../{questiontypes => type}/truefalse/version.php   |   0
 119 files changed, 55 insertions(+), 55 deletions(-)
 rename question/{questiontypes => type}/calculated/db/mysql.php (78%)
 rename question/{questiontypes => type}/calculated/db/mysql.sql (100%)
 rename question/{questiontypes => type}/calculated/db/postgre7.php (80%)
 rename question/{questiontypes => type}/calculated/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/calculated/editquestion.html (100%)
 rename question/{questiontypes => type}/calculated/editquestion.php (97%)
 rename question/{questiontypes => type}/calculated/icon.gif (100%)
 rename question/{questiontypes => type}/calculated/questiontype.php (99%)
 rename question/{questiontypes => type}/calculated/version.php (100%)
 rename question/{questiontypes => type}/datasetdependent/abstractqtype.php (99%)
 rename question/{questiontypes => type}/datasetdependent/categorydatasetdefinitions.php (100%)
 rename question/{questiontypes => type}/datasetdependent/datasetdefinitions.php (87%)
 rename question/{questiontypes => type}/datasetdependent/datasetitems.php (100%)
 rename question/{questiontypes => type}/datasetdependent/questiondatasets.html (100%)
 rename question/{questiontypes => type}/description/editquestion.html (100%)
 rename question/{questiontypes => type}/description/editquestion.php (57%)
 rename question/{questiontypes => type}/description/icon.gif (100%)
 rename question/{questiontypes => type}/description/question.html (100%)
 rename question/{questiontypes => type}/description/questiontype.php (96%)
 rename question/{questiontypes => type}/essay/db/mysql.php (79%)
 rename question/{questiontypes => type}/essay/db/mysql.sql (100%)
 rename question/{questiontypes => type}/essay/db/postgre7.php (78%)
 rename question/{questiontypes => type}/essay/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/essay/editquestion.html (100%)
 rename question/{questiontypes => type}/essay/editquestion.php (83%)
 rename question/{questiontypes => type}/essay/icon.gif (100%)
 rename question/{questiontypes => type}/essay/questiontype.php (100%)
 rename question/{questiontypes => type}/essay/version.php (100%)
 rename question/{questiontypes => type}/match/db/mysql.php (79%)
 rename question/{questiontypes => type}/match/db/mysql.sql (100%)
 rename question/{questiontypes => type}/match/db/postgre7.php (78%)
 rename question/{questiontypes => type}/match/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/match/display.html (100%)
 rename question/{questiontypes => type}/match/editquestion.html (100%)
 rename question/{questiontypes => type}/match/editquestion.php (93%)
 rename question/{questiontypes => type}/match/icon.gif (100%)
 rename question/{questiontypes => type}/match/questiontype.php (99%)
 rename question/{questiontypes => type}/match/version.php (100%)
 rename question/{questiontypes => type}/multianswer/db/mysql.php (78%)
 rename question/{questiontypes => type}/multianswer/db/mysql.sql (100%)
 rename question/{questiontypes => type}/multianswer/db/postgre7.php (78%)
 rename question/{questiontypes => type}/multianswer/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/multianswer/editquestion.html (100%)
 rename question/{questiontypes => type}/multianswer/editquestion.php (96%)
 rename question/{questiontypes => type}/multianswer/icon.gif (100%)
 rename question/{questiontypes => type}/multianswer/questiontype.php (100%)
 rename question/{questiontypes => type}/multianswer/version.php (100%)
 rename question/{questiontypes => type}/multichoice/backuplib.php (100%)
 rename question/{questiontypes => type}/multichoice/db/mysql.php (78%)
 rename question/{questiontypes => type}/multichoice/db/mysql.sql (100%)
 rename question/{questiontypes => type}/multichoice/db/postgre7.php (78%)
 rename question/{questiontypes => type}/multichoice/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/multichoice/display.html (100%)
 rename question/{questiontypes => type}/multichoice/editquestion.html (100%)
 rename question/{questiontypes => type}/multichoice/editquestion.php (91%)
 rename question/{questiontypes => type}/multichoice/icon.gif (100%)
 rename question/{questiontypes => type}/multichoice/questiontype.php (99%)
 rename question/{questiontypes => type}/multichoice/version.php (100%)
 rename question/{questiontypes => type}/numerical/db/mysql.php (78%)
 rename question/{questiontypes => type}/numerical/db/mysql.sql (100%)
 rename question/{questiontypes => type}/numerical/db/postgre7.php (78%)
 rename question/{questiontypes => type}/numerical/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/numerical/editquestion.html (100%)
 rename question/{questiontypes => type}/numerical/editquestion.php (93%)
 rename question/{questiontypes => type}/numerical/icon.gif (100%)
 rename question/{questiontypes => type}/numerical/questiontype.php (99%)
 rename question/{questiontypes => type}/numerical/version.php (100%)
 rename question/{questiontypes => type}/question.html (100%)
 rename question/{questiontypes => type}/questiontype.php (99%)
 rename question/{questiontypes => type}/random/editquestion.html (100%)
 rename question/{questiontypes => type}/random/editquestion.php (56%)
 rename question/{questiontypes => type}/random/icon.gif (100%)
 rename question/{questiontypes => type}/random/questiontype.php (100%)
 rename question/{questiontypes => type}/randomsamatch/db/mysql.php (78%)
 rename question/{questiontypes => type}/randomsamatch/db/mysql.sql (100%)
 rename question/{questiontypes => type}/randomsamatch/db/postgre7.php (78%)
 rename question/{questiontypes => type}/randomsamatch/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/randomsamatch/editquestion.html (100%)
 rename question/{questiontypes => type}/randomsamatch/editquestion.php (87%)
 rename question/{questiontypes => type}/randomsamatch/icon.gif (100%)
 rename question/{questiontypes => type}/randomsamatch/questiontype.php (100%)
 rename question/{questiontypes => type}/randomsamatch/version.php (100%)
 rename question/{questiontypes => type}/rqp/db/mysql.php (79%)
 rename question/{questiontypes => type}/rqp/db/mysql.sql (100%)
 rename question/{questiontypes => type}/rqp/db/postgre7.php (79%)
 rename question/{questiontypes => type}/rqp/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/rqp/editquestion.html (100%)
 rename question/{questiontypes => type}/rqp/editquestion.php (90%)
 rename question/{questiontypes => type}/rqp/icon.gif (100%)
 rename question/{questiontypes => type}/rqp/lib.php (100%)
 rename question/{questiontypes => type}/rqp/questiontype.php (99%)
 rename question/{questiontypes => type}/rqp/remote.php (98%)
 rename question/{questiontypes => type}/rqp/rqp.php (100%)
 rename question/{questiontypes => type}/rqp/types.php (96%)
 rename question/{questiontypes => type}/rqp/version.php (100%)
 rename question/{questiontypes => type}/shortanswer/backuplib.php (100%)
 rename question/{questiontypes => type}/shortanswer/db/mysql.php (78%)
 rename question/{questiontypes => type}/shortanswer/db/mysql.sql (100%)
 rename question/{questiontypes => type}/shortanswer/db/postgre7.php (78%)
 rename question/{questiontypes => type}/shortanswer/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/shortanswer/display.html (100%)
 rename question/{questiontypes => type}/shortanswer/editquestion.html (100%)
 rename question/{questiontypes => type}/shortanswer/editquestion.php (90%)
 rename question/{questiontypes => type}/shortanswer/icon.gif (100%)
 rename question/{questiontypes => type}/shortanswer/questiontype.php (99%)
 rename question/{questiontypes => type}/shortanswer/version.php (100%)
 rename question/{questiontypes => type}/truefalse/db/mysql.php (78%)
 rename question/{questiontypes => type}/truefalse/db/mysql.sql (100%)
 rename question/{questiontypes => type}/truefalse/db/postgre7.php (78%)
 rename question/{questiontypes => type}/truefalse/db/postgre7.sql (100%)
 rename question/{questiontypes => type}/truefalse/display.html (100%)
 rename question/{questiontypes => type}/truefalse/editquestion.html (100%)
 rename question/{questiontypes => type}/truefalse/editquestion.php (90%)
 rename question/{questiontypes => type}/truefalse/icon.gif (100%)
 rename question/{questiontypes => type}/truefalse/questiontype.php (99%)
 rename question/{questiontypes => type}/truefalse/version.php (100%)

diff --git a/lib/questionlib.php b/lib/questionlib.php
index 7e7b068202..921f1462d7 100644
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -105,7 +105,7 @@ require_once("$CFG->dirroot/question/type/questiontype.php");
 * These files in turn instantiate the corresponding question type class
 * and add them to the $QTYPES array
 */
-$qtypenames= get_list_of_plugins('question/questiontypes');
+$qtypenames= get_list_of_plugins('question/type');
 foreach($qtypenames as $qtypename) {
     // Instanciates all plug-in question types
     $qtypefilepath= "$CFG->dirroot/question/type/$qtypename/questiontype.php";
diff --git a/question/format/qti2/qt_common.php b/question/format/qti2/qt_common.php
index 4fd53d00e6..f39682d756 100644
--- a/question/format/qti2/qt_common.php
+++ b/question/format/qti2/qt_common.php
@@ -11,7 +11,7 @@
  *
  * @param int courseid
  * @return array containing filenames
- * @calledfrom questiontypes/<typename>/editquestion.php 
+ * @calledfrom type/<typename>/editquestion.php 
  */
 function get_course_media_files($courseid) 
 {
@@ -144,4 +144,4 @@ function get_file_dimensions($file) {
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/question/question.php b/question/question.php
index 63f8fad38e..49ff99cd4d 100644
--- a/question/question.php
+++ b/question/question.php
@@ -346,7 +346,7 @@
 
     echo '<br />';
     print_simple_box_start('center');
-    require_once('questiontypes/'.$QTYPES[$qtype]->name().'/editquestion.php');
+    require_once('type/'.$QTYPES[$qtype]->name().'/editquestion.php');
     print_simple_box_end();
 
     if ($usehtmleditor) {
diff --git a/question/questiontypes/calculated/db/mysql.php b/question/type/calculated/db/mysql.php
similarity index 78%
rename from question/questiontypes/calculated/db/mysql.php
rename to question/type/calculated/db/mysql.php
index f0f6687276..1f0612135f 100644
--- a/question/questiontypes/calculated/db/mysql.php
+++ b/question/type/calculated/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_calculated_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/calculated/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/calculated/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/calculated/db/mysql.sql b/question/type/calculated/db/mysql.sql
similarity index 100%
rename from question/questiontypes/calculated/db/mysql.sql
rename to question/type/calculated/db/mysql.sql
diff --git a/question/questiontypes/calculated/db/postgre7.php b/question/type/calculated/db/postgre7.php
similarity index 80%
rename from question/questiontypes/calculated/db/postgre7.php
rename to question/type/calculated/db/postgre7.php
index cc7dc75a59..561fa1c1ec 100644
--- a/question/questiontypes/calculated/db/postgre7.php
+++ b/question/type/calculated/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_calculated_upgrade($oldversion=0) {
     require_once("$CFG->libdir/questionlib.php");
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/calculated/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/calculated/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/calculated/db/postgre7.sql b/question/type/calculated/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/calculated/db/postgre7.sql
rename to question/type/calculated/db/postgre7.sql
diff --git a/question/questiontypes/calculated/editquestion.html b/question/type/calculated/editquestion.html
similarity index 100%
rename from question/questiontypes/calculated/editquestion.html
rename to question/type/calculated/editquestion.html
diff --git a/question/questiontypes/calculated/editquestion.php b/question/type/calculated/editquestion.php
similarity index 97%
rename from question/questiontypes/calculated/editquestion.php
rename to question/type/calculated/editquestion.php
index 0c4e3c7866..c8fbb93dd8 100644
--- a/question/questiontypes/calculated/editquestion.php
+++ b/question/type/calculated/editquestion.php
@@ -83,7 +83,7 @@ if (empty($form)) {
         }
     }
     print_heading_with_help(get_string("editingcalculated", "quiz"), "calculated", "quiz");
-    require("$CFG->dirroot/question/questiontypes/calculated/editquestion.html");
+    require("$CFG->dirroot/question/type/calculated/editquestion.html");
 } else { // $form is not empty
     /*********************************************************/
     /*****    Any subsequent page of the question wizard    **/
diff --git a/question/questiontypes/calculated/icon.gif b/question/type/calculated/icon.gif
similarity index 100%
rename from question/questiontypes/calculated/icon.gif
rename to question/type/calculated/icon.gif
diff --git a/question/questiontypes/calculated/questiontype.php b/question/type/calculated/questiontype.php
similarity index 99%
rename from question/questiontypes/calculated/questiontype.php
rename to question/type/calculated/questiontype.php
index b3332f84e5..1ec2c91a90 100644
--- a/question/questiontypes/calculated/questiontype.php
+++ b/question/type/calculated/questiontype.php
@@ -6,7 +6,7 @@
 
 /// QUESTION TYPE CLASS //////////////////
 
-require_once("$CFG->dirroot/question/questiontypes/datasetdependent/abstractqtype.php");
+require_once("$CFG->dirroot/question/type/datasetdependent/abstractqtype.php");
 
 class question_calculated_qtype extends question_dataset_dependent_questiontype {
 
@@ -318,7 +318,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
 
     function create_virtual_qtype() {
         global $CFG;
-        require_once("$CFG->dirroot/question/questiontypes/numerical/questiontype.php");
+        require_once("$CFG->dirroot/question/type/numerical/questiontype.php");
         return new question_numerical_qtype();
     }
 
diff --git a/question/questiontypes/calculated/version.php b/question/type/calculated/version.php
similarity index 100%
rename from question/questiontypes/calculated/version.php
rename to question/type/calculated/version.php
diff --git a/question/questiontypes/datasetdependent/abstractqtype.php b/question/type/datasetdependent/abstractqtype.php
similarity index 99%
rename from question/questiontypes/datasetdependent/abstractqtype.php
rename to question/type/datasetdependent/abstractqtype.php
index 539229b622..49c1609ef4 100644
--- a/question/questiontypes/datasetdependent/abstractqtype.php
+++ b/question/type/datasetdependent/abstractqtype.php
@@ -156,11 +156,11 @@ class question_dataset_dependent_questiontype extends default_questiontype {
         // See where we're coming from
         switch($form->wizardpage) {
             case 'question':
-                require("$CFG->dirroot/question/questiontypes/datasetdependent/datasetdefinitions.php");
+                require("$CFG->dirroot/question/type/datasetdependent/datasetdefinitions.php");
                 break;
             case 'datasetdefinitions':
             case 'datasetitems':
-                require("$CFG->dirroot/question/questiontypes/datasetdependent/datasetitems.php");
+                require("$CFG->dirroot/question/type/datasetdependent/datasetitems.php");
                 break;
             default:
                 error('Incorrect or no wizard page specified!');
diff --git a/question/questiontypes/datasetdependent/categorydatasetdefinitions.php b/question/type/datasetdependent/categorydatasetdefinitions.php
similarity index 100%
rename from question/questiontypes/datasetdependent/categorydatasetdefinitions.php
rename to question/type/datasetdependent/categorydatasetdefinitions.php
diff --git a/question/questiontypes/datasetdependent/datasetdefinitions.php b/question/type/datasetdependent/datasetdefinitions.php
similarity index 87%
rename from question/questiontypes/datasetdependent/datasetdefinitions.php
rename to question/type/datasetdependent/datasetdefinitions.php
index b334828c18..cdb5814c47 100644
--- a/question/questiontypes/datasetdependent/datasetdefinitions.php
+++ b/question/type/datasetdependent/datasetdefinitions.php
@@ -14,5 +14,5 @@ $datasets = $this->construct_dataset_menus(
 
 // Print the page
 print_heading_with_help(get_string("choosedatasetproperties", "quiz"), "questiondatasets", "quiz");
-require("$CFG->dirroot/question/questiontypes/datasetdependent/questiondatasets.html");
+require("$CFG->dirroot/question/type/datasetdependent/questiondatasets.html");
 ?>
diff --git a/question/questiontypes/datasetdependent/datasetitems.php b/question/type/datasetdependent/datasetitems.php
similarity index 100%
rename from question/questiontypes/datasetdependent/datasetitems.php
rename to question/type/datasetdependent/datasetitems.php
diff --git a/question/questiontypes/datasetdependent/questiondatasets.html b/question/type/datasetdependent/questiondatasets.html
similarity index 100%
rename from question/questiontypes/datasetdependent/questiondatasets.html
rename to question/type/datasetdependent/questiondatasets.html
diff --git a/question/questiontypes/description/editquestion.html b/question/type/description/editquestion.html
similarity index 100%
rename from question/questiontypes/description/editquestion.html
rename to question/type/description/editquestion.html
diff --git a/question/questiontypes/description/editquestion.php b/question/type/description/editquestion.php
similarity index 57%
rename from question/questiontypes/description/editquestion.php
rename to question/type/description/editquestion.php
index 9bd6fc6c4e..c6363451bd 100644
--- a/question/questiontypes/description/editquestion.php
+++ b/question/type/description/editquestion.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 
     print_heading_with_help(get_string("editingdescription", "quiz"), "description", "quiz");
-    require("$CFG->dirroot/question/questiontypes/description/editquestion.html");
+    require("$CFG->dirroot/question/type/description/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/description/icon.gif b/question/type/description/icon.gif
similarity index 100%
rename from question/questiontypes/description/icon.gif
rename to question/type/description/icon.gif
diff --git a/question/questiontypes/description/question.html b/question/type/description/question.html
similarity index 100%
rename from question/questiontypes/description/question.html
rename to question/type/description/question.html
diff --git a/question/questiontypes/description/questiontype.php b/question/type/description/questiontype.php
similarity index 96%
rename from question/questiontypes/description/questiontype.php
rename to question/type/description/questiontype.php
index c9bdc72e08..4038b2f938 100644
--- a/question/questiontypes/description/questiontype.php
+++ b/question/type/description/questiontype.php
@@ -46,7 +46,7 @@ class description_qtype extends default_questiontype {
                          $formatoptions, $cmoptions->course);
         $image = get_question_image($question, $cmoptions->course);
 
-        include "$CFG->dirroot/question/questiontypes/description/question.html";
+        include "$CFG->dirroot/question/type/description/question.html";
     }
 
     function actual_number_of_questions($question) {
diff --git a/question/questiontypes/essay/db/mysql.php b/question/type/essay/db/mysql.php
similarity index 79%
rename from question/questiontypes/essay/db/mysql.php
rename to question/type/essay/db/mysql.php
index 903793f7ef..f6e1986a10 100644
--- a/question/questiontypes/essay/db/mysql.php
+++ b/question/type/essay/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_essay_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/essay/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/essay/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/essay/db/mysql.sql b/question/type/essay/db/mysql.sql
similarity index 100%
rename from question/questiontypes/essay/db/mysql.sql
rename to question/type/essay/db/mysql.sql
diff --git a/question/questiontypes/essay/db/postgre7.php b/question/type/essay/db/postgre7.php
similarity index 78%
rename from question/questiontypes/essay/db/postgre7.php
rename to question/type/essay/db/postgre7.php
index 7283040c39..c990635f36 100644
--- a/question/questiontypes/essay/db/postgre7.php
+++ b/question/type/essay/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_essay_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/essay/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/essay/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/essay/db/postgre7.sql b/question/type/essay/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/essay/db/postgre7.sql
rename to question/type/essay/db/postgre7.sql
diff --git a/question/questiontypes/essay/editquestion.html b/question/type/essay/editquestion.html
similarity index 100%
rename from question/questiontypes/essay/editquestion.html
rename to question/type/essay/editquestion.html
diff --git a/question/questiontypes/essay/editquestion.php b/question/type/essay/editquestion.php
similarity index 83%
rename from question/questiontypes/essay/editquestion.php
rename to question/type/essay/editquestion.php
index 4caa90f3dd..2f87d648f0 100644
--- a/question/questiontypes/essay/editquestion.php
+++ b/question/type/essay/editquestion.php
@@ -11,6 +11,6 @@
     }
 
     print_heading_with_help(get_string("editingessay", "quiz"), "essay", "quiz");
-    require("$CFG->dirroot/question/questiontypes/essay/editquestion.html");
+    require("$CFG->dirroot/question/type/essay/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/essay/icon.gif b/question/type/essay/icon.gif
similarity index 100%
rename from question/questiontypes/essay/icon.gif
rename to question/type/essay/icon.gif
diff --git a/question/questiontypes/essay/questiontype.php b/question/type/essay/questiontype.php
similarity index 100%
rename from question/questiontypes/essay/questiontype.php
rename to question/type/essay/questiontype.php
diff --git a/question/questiontypes/essay/version.php b/question/type/essay/version.php
similarity index 100%
rename from question/questiontypes/essay/version.php
rename to question/type/essay/version.php
diff --git a/question/questiontypes/match/db/mysql.php b/question/type/match/db/mysql.php
similarity index 79%
rename from question/questiontypes/match/db/mysql.php
rename to question/type/match/db/mysql.php
index 29ae16521f..9327a9ae46 100644
--- a/question/questiontypes/match/db/mysql.php
+++ b/question/type/match/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_match_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/match/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/match/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/match/db/mysql.sql b/question/type/match/db/mysql.sql
similarity index 100%
rename from question/questiontypes/match/db/mysql.sql
rename to question/type/match/db/mysql.sql
diff --git a/question/questiontypes/match/db/postgre7.php b/question/type/match/db/postgre7.php
similarity index 78%
rename from question/questiontypes/match/db/postgre7.php
rename to question/type/match/db/postgre7.php
index c8d0d16db7..70e1b447c6 100644
--- a/question/questiontypes/match/db/postgre7.php
+++ b/question/type/match/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_match_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/match/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/match/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/match/db/postgre7.sql b/question/type/match/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/match/db/postgre7.sql
rename to question/type/match/db/postgre7.sql
diff --git a/question/questiontypes/match/display.html b/question/type/match/display.html
similarity index 100%
rename from question/questiontypes/match/display.html
rename to question/type/match/display.html
diff --git a/question/questiontypes/match/editquestion.html b/question/type/match/editquestion.html
similarity index 100%
rename from question/questiontypes/match/editquestion.html
rename to question/type/match/editquestion.html
diff --git a/question/questiontypes/match/editquestion.php b/question/type/match/editquestion.php
similarity index 93%
rename from question/questiontypes/match/editquestion.php
rename to question/type/match/editquestion.php
index b36d324583..bd85367fef 100644
--- a/question/questiontypes/match/editquestion.php
+++ b/question/type/match/editquestion.php
@@ -32,6 +32,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingmatch", "quiz"), "match", "quiz");
-    require("$CFG->dirroot/question/questiontypes/match/editquestion.html");
+    require("$CFG->dirroot/question/type/match/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/match/icon.gif b/question/type/match/icon.gif
similarity index 100%
rename from question/questiontypes/match/icon.gif
rename to question/type/match/icon.gif
diff --git a/question/questiontypes/match/questiontype.php b/question/type/match/questiontype.php
similarity index 99%
rename from question/questiontypes/match/questiontype.php
rename to question/type/match/questiontype.php
index 6fb82961d9..3205eae761 100644
--- a/question/questiontypes/match/questiontype.php
+++ b/question/type/match/questiontype.php
@@ -272,7 +272,7 @@ class question_match_qtype extends default_questiontype {
 
             $anss[] = clone($a);
         }
-        include("$CFG->dirroot/question/questiontypes/match/display.html");
+        include("$CFG->dirroot/question/type/match/display.html");
     }
 
     function grade_responses(&$question, &$state, $cmoptions) {
diff --git a/question/questiontypes/match/version.php b/question/type/match/version.php
similarity index 100%
rename from question/questiontypes/match/version.php
rename to question/type/match/version.php
diff --git a/question/questiontypes/multianswer/db/mysql.php b/question/type/multianswer/db/mysql.php
similarity index 78%
rename from question/questiontypes/multianswer/db/mysql.php
rename to question/type/multianswer/db/mysql.php
index 32337c043b..d87ecde271 100644
--- a/question/questiontypes/multianswer/db/mysql.php
+++ b/question/type/multianswer/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_multianswer_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/multianswer/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/multianswer/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/multianswer/db/mysql.sql b/question/type/multianswer/db/mysql.sql
similarity index 100%
rename from question/questiontypes/multianswer/db/mysql.sql
rename to question/type/multianswer/db/mysql.sql
diff --git a/question/questiontypes/multianswer/db/postgre7.php b/question/type/multianswer/db/postgre7.php
similarity index 78%
rename from question/questiontypes/multianswer/db/postgre7.php
rename to question/type/multianswer/db/postgre7.php
index 312310cbc6..87d8a27c77 100644
--- a/question/questiontypes/multianswer/db/postgre7.php
+++ b/question/type/multianswer/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_multianswer_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/multianswer/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/multianswer/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/multianswer/db/postgre7.sql b/question/type/multianswer/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/multianswer/db/postgre7.sql
rename to question/type/multianswer/db/postgre7.sql
diff --git a/question/questiontypes/multianswer/editquestion.html b/question/type/multianswer/editquestion.html
similarity index 100%
rename from question/questiontypes/multianswer/editquestion.html
rename to question/type/multianswer/editquestion.html
diff --git a/question/questiontypes/multianswer/editquestion.php b/question/type/multianswer/editquestion.php
similarity index 96%
rename from question/questiontypes/multianswer/editquestion.php
rename to question/type/multianswer/editquestion.php
index 42dbdf2072..0ef97c4d08 100644
--- a/question/questiontypes/multianswer/editquestion.php
+++ b/question/type/multianswer/editquestion.php
@@ -49,6 +49,6 @@
     }
     print_heading_with_help(get_string('editingmultianswer', 'quiz'),
                                        'multianswer', 'quiz');
-    require("$CFG->dirroot/question/questiontypes/multianswer/editquestion.html");
+    require("$CFG->dirroot/question/type/multianswer/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/multianswer/icon.gif b/question/type/multianswer/icon.gif
similarity index 100%
rename from question/questiontypes/multianswer/icon.gif
rename to question/type/multianswer/icon.gif
diff --git a/question/questiontypes/multianswer/questiontype.php b/question/type/multianswer/questiontype.php
similarity index 100%
rename from question/questiontypes/multianswer/questiontype.php
rename to question/type/multianswer/questiontype.php
diff --git a/question/questiontypes/multianswer/version.php b/question/type/multianswer/version.php
similarity index 100%
rename from question/questiontypes/multianswer/version.php
rename to question/type/multianswer/version.php
diff --git a/question/questiontypes/multichoice/backuplib.php b/question/type/multichoice/backuplib.php
similarity index 100%
rename from question/questiontypes/multichoice/backuplib.php
rename to question/type/multichoice/backuplib.php
diff --git a/question/questiontypes/multichoice/db/mysql.php b/question/type/multichoice/db/mysql.php
similarity index 78%
rename from question/questiontypes/multichoice/db/mysql.php
rename to question/type/multichoice/db/mysql.php
index d717705fb6..1ad38a0e8b 100644
--- a/question/questiontypes/multichoice/db/mysql.php
+++ b/question/type/multichoice/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_multichoice_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/multichoice/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/multichoice/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/multichoice/db/mysql.sql b/question/type/multichoice/db/mysql.sql
similarity index 100%
rename from question/questiontypes/multichoice/db/mysql.sql
rename to question/type/multichoice/db/mysql.sql
diff --git a/question/questiontypes/multichoice/db/postgre7.php b/question/type/multichoice/db/postgre7.php
similarity index 78%
rename from question/questiontypes/multichoice/db/postgre7.php
rename to question/type/multichoice/db/postgre7.php
index b2e6bd4f00..f14c1de734 100644
--- a/question/questiontypes/multichoice/db/postgre7.php
+++ b/question/type/multichoice/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_multichoice_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/multichoice/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/multichoice/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/multichoice/db/postgre7.sql b/question/type/multichoice/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/multichoice/db/postgre7.sql
rename to question/type/multichoice/db/postgre7.sql
diff --git a/question/questiontypes/multichoice/display.html b/question/type/multichoice/display.html
similarity index 100%
rename from question/questiontypes/multichoice/display.html
rename to question/type/multichoice/display.html
diff --git a/question/questiontypes/multichoice/editquestion.html b/question/type/multichoice/editquestion.html
similarity index 100%
rename from question/questiontypes/multichoice/editquestion.html
rename to question/type/multichoice/editquestion.html
diff --git a/question/questiontypes/multichoice/editquestion.php b/question/type/multichoice/editquestion.php
similarity index 91%
rename from question/questiontypes/multichoice/editquestion.php
rename to question/type/multichoice/editquestion.php
index 63a0f1e251..2f55609deb 100644
--- a/question/questiontypes/multichoice/editquestion.php
+++ b/question/type/multichoice/editquestion.php
@@ -30,6 +30,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingmultichoice", "quiz"), "multichoice", "quiz");
-    require("$CFG->dirroot/question/questiontypes/multichoice/editquestion.html");
+    require("$CFG->dirroot/question/type/multichoice/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/multichoice/icon.gif b/question/type/multichoice/icon.gif
similarity index 100%
rename from question/questiontypes/multichoice/icon.gif
rename to question/type/multichoice/icon.gif
diff --git a/question/questiontypes/multichoice/questiontype.php b/question/type/multichoice/questiontype.php
similarity index 99%
rename from question/questiontypes/multichoice/questiontype.php
rename to question/type/multichoice/questiontype.php
index 130c0f936e..ae4b18c281 100644
--- a/question/questiontypes/multichoice/questiontype.php
+++ b/question/type/multichoice/questiontype.php
@@ -314,7 +314,7 @@ class question_multichoice_qtype extends default_questiontype {
 
             $anss[] = clone($a);
         }
-        include("$CFG->dirroot/question/questiontypes/multichoice/display.html");
+        include("$CFG->dirroot/question/type/multichoice/display.html");
     }
 
     function grade_responses(&$question, &$state, $cmoptions) {
diff --git a/question/questiontypes/multichoice/version.php b/question/type/multichoice/version.php
similarity index 100%
rename from question/questiontypes/multichoice/version.php
rename to question/type/multichoice/version.php
diff --git a/question/questiontypes/numerical/db/mysql.php b/question/type/numerical/db/mysql.php
similarity index 78%
rename from question/questiontypes/numerical/db/mysql.php
rename to question/type/numerical/db/mysql.php
index ec184a6c7d..8a455cea70 100644
--- a/question/questiontypes/numerical/db/mysql.php
+++ b/question/type/numerical/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_numerical_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/numerical/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/numerical/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/numerical/db/mysql.sql b/question/type/numerical/db/mysql.sql
similarity index 100%
rename from question/questiontypes/numerical/db/mysql.sql
rename to question/type/numerical/db/mysql.sql
diff --git a/question/questiontypes/numerical/db/postgre7.php b/question/type/numerical/db/postgre7.php
similarity index 78%
rename from question/questiontypes/numerical/db/postgre7.php
rename to question/type/numerical/db/postgre7.php
index 5657caf2fa..bc377842cb 100644
--- a/question/questiontypes/numerical/db/postgre7.php
+++ b/question/type/numerical/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_numerical_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/numerical/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/numerical/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/numerical/db/postgre7.sql b/question/type/numerical/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/numerical/db/postgre7.sql
rename to question/type/numerical/db/postgre7.sql
diff --git a/question/questiontypes/numerical/editquestion.html b/question/type/numerical/editquestion.html
similarity index 100%
rename from question/questiontypes/numerical/editquestion.html
rename to question/type/numerical/editquestion.html
diff --git a/question/questiontypes/numerical/editquestion.php b/question/type/numerical/editquestion.php
similarity index 93%
rename from question/questiontypes/numerical/editquestion.php
rename to question/type/numerical/editquestion.php
index ea20ecd373..e746437252 100644
--- a/question/questiontypes/numerical/editquestion.php
+++ b/question/type/numerical/editquestion.php
@@ -22,6 +22,6 @@
     }
 
     print_heading_with_help(get_string("editingnumerical", "quiz"), "numerical", "quiz");
-    require("$CFG->dirroot/question/questiontypes/numerical/editquestion.html");
+    require("$CFG->dirroot/question/type/numerical/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/numerical/icon.gif b/question/type/numerical/icon.gif
similarity index 100%
rename from question/questiontypes/numerical/icon.gif
rename to question/type/numerical/icon.gif
diff --git a/question/questiontypes/numerical/questiontype.php b/question/type/numerical/questiontype.php
similarity index 99%
rename from question/questiontypes/numerical/questiontype.php
rename to question/type/numerical/questiontype.php
index 74c34d9dd1..f3f12c4b3e 100644
--- a/question/questiontypes/numerical/questiontype.php
+++ b/question/type/numerical/questiontype.php
@@ -14,7 +14,7 @@
 /// This question type behaves like shortanswer in most cases.
 /// Therefore, it extends the shortanswer question type...
 
-require_once("$CFG->dirroot/question/questiontypes/shortanswer/questiontype.php");
+require_once("$CFG->dirroot/question/type/shortanswer/questiontype.php");
 
 class question_numerical_qtype extends question_shortanswer_qtype {
 
diff --git a/question/questiontypes/numerical/version.php b/question/type/numerical/version.php
similarity index 100%
rename from question/questiontypes/numerical/version.php
rename to question/type/numerical/version.php
diff --git a/question/questiontypes/question.html b/question/type/question.html
similarity index 100%
rename from question/questiontypes/question.html
rename to question/type/question.html
diff --git a/question/questiontypes/questiontype.php b/question/type/questiontype.php
similarity index 99%
rename from question/questiontypes/questiontype.php
rename to question/type/questiontype.php
index a84b45f425..e70d93ebcd 100644
--- a/question/questiontypes/questiontype.php
+++ b/question/type/questiontype.php
@@ -476,7 +476,7 @@ class default_questiontype {
 
         $history = $this->history($question, $state, $number, $cmoptions, $options);
 
-        include "$CFG->dirroot/question/questiontypes/question.html";
+        include "$CFG->dirroot/question/type/question.html";
     }
 
     /*
@@ -843,7 +843,7 @@ class default_questiontype {
     *                  get_string($name, 'quiz') will be called.
     * ->link           The filename part of the URL for the link. The full URL
     *                  is contructed as
-    *                  "$CFG->wwwroot/question/questiontypes/{$this->name()}/$link?sesskey=$sesskey"
+    *                  "$CFG->wwwroot/question/type/{$this->name()}/$link?sesskey=$sesskey"
     *                  [but with the relavant calls to the s and rawurlencode
     *                  functions] where $sesskey is the sesskey for the user.
     * @return array    Array of objects describing the configuration options to
diff --git a/question/questiontypes/random/editquestion.html b/question/type/random/editquestion.html
similarity index 100%
rename from question/questiontypes/random/editquestion.html
rename to question/type/random/editquestion.html
diff --git a/question/questiontypes/random/editquestion.php b/question/type/random/editquestion.php
similarity index 56%
rename from question/questiontypes/random/editquestion.php
rename to question/type/random/editquestion.php
index 80d2301c51..03e0ea2005 100644
--- a/question/questiontypes/random/editquestion.php
+++ b/question/type/random/editquestion.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 
     print_heading_with_help(get_string("editingrandom", "quiz"), "random", "quiz");
-    require("$CFG->dirroot/question/questiontypes/random/editquestion.html");
+    require("$CFG->dirroot/question/type/random/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/random/icon.gif b/question/type/random/icon.gif
similarity index 100%
rename from question/questiontypes/random/icon.gif
rename to question/type/random/icon.gif
diff --git a/question/questiontypes/random/questiontype.php b/question/type/random/questiontype.php
similarity index 100%
rename from question/questiontypes/random/questiontype.php
rename to question/type/random/questiontype.php
diff --git a/question/questiontypes/randomsamatch/db/mysql.php b/question/type/randomsamatch/db/mysql.php
similarity index 78%
rename from question/questiontypes/randomsamatch/db/mysql.php
rename to question/type/randomsamatch/db/mysql.php
index cb57d53899..6057208902 100644
--- a/question/questiontypes/randomsamatch/db/mysql.php
+++ b/question/type/randomsamatch/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_randomsamatch_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/randomsamatch/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/randomsamatch/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/randomsamatch/db/mysql.sql b/question/type/randomsamatch/db/mysql.sql
similarity index 100%
rename from question/questiontypes/randomsamatch/db/mysql.sql
rename to question/type/randomsamatch/db/mysql.sql
diff --git a/question/questiontypes/randomsamatch/db/postgre7.php b/question/type/randomsamatch/db/postgre7.php
similarity index 78%
rename from question/questiontypes/randomsamatch/db/postgre7.php
rename to question/type/randomsamatch/db/postgre7.php
index 46fccc559d..92ef559779 100644
--- a/question/questiontypes/randomsamatch/db/postgre7.php
+++ b/question/type/randomsamatch/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_randomsamatch_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/randomsamatch/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/randomsamatch/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/randomsamatch/db/postgre7.sql b/question/type/randomsamatch/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/randomsamatch/db/postgre7.sql
rename to question/type/randomsamatch/db/postgre7.sql
diff --git a/question/questiontypes/randomsamatch/editquestion.html b/question/type/randomsamatch/editquestion.html
similarity index 100%
rename from question/questiontypes/randomsamatch/editquestion.html
rename to question/type/randomsamatch/editquestion.html
diff --git a/question/questiontypes/randomsamatch/editquestion.php b/question/type/randomsamatch/editquestion.php
similarity index 87%
rename from question/questiontypes/randomsamatch/editquestion.php
rename to question/type/randomsamatch/editquestion.php
index ee53a95d78..cdd93f1781 100644
--- a/question/questiontypes/randomsamatch/editquestion.php
+++ b/question/type/randomsamatch/editquestion.php
@@ -14,6 +14,6 @@
     $yesnooptions[1] = get_string("yes");
 
     print_heading_with_help(get_string("editingrandomsamatch", "quiz"), "randomsamatch", "quiz");
-    require("$CFG->dirroot/question/questiontypes/randomsamatch/editquestion.html");
+    require("$CFG->dirroot/question/type/randomsamatch/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/randomsamatch/icon.gif b/question/type/randomsamatch/icon.gif
similarity index 100%
rename from question/questiontypes/randomsamatch/icon.gif
rename to question/type/randomsamatch/icon.gif
diff --git a/question/questiontypes/randomsamatch/questiontype.php b/question/type/randomsamatch/questiontype.php
similarity index 100%
rename from question/questiontypes/randomsamatch/questiontype.php
rename to question/type/randomsamatch/questiontype.php
diff --git a/question/questiontypes/randomsamatch/version.php b/question/type/randomsamatch/version.php
similarity index 100%
rename from question/questiontypes/randomsamatch/version.php
rename to question/type/randomsamatch/version.php
diff --git a/question/questiontypes/rqp/db/mysql.php b/question/type/rqp/db/mysql.php
similarity index 79%
rename from question/questiontypes/rqp/db/mysql.php
rename to question/type/rqp/db/mysql.php
index 424d48f37e..49046cadcd 100644
--- a/question/questiontypes/rqp/db/mysql.php
+++ b/question/type/rqp/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_rqp_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/rqp/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/rqp/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/rqp/db/mysql.sql b/question/type/rqp/db/mysql.sql
similarity index 100%
rename from question/questiontypes/rqp/db/mysql.sql
rename to question/type/rqp/db/mysql.sql
diff --git a/question/questiontypes/rqp/db/postgre7.php b/question/type/rqp/db/postgre7.php
similarity index 79%
rename from question/questiontypes/rqp/db/postgre7.php
rename to question/type/rqp/db/postgre7.php
index e27e225179..3b680051f7 100644
--- a/question/questiontypes/rqp/db/postgre7.php
+++ b/question/type/rqp/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_rqp_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/rqp/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/rqp/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/rqp/db/postgre7.sql b/question/type/rqp/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/rqp/db/postgre7.sql
rename to question/type/rqp/db/postgre7.sql
diff --git a/question/questiontypes/rqp/editquestion.html b/question/type/rqp/editquestion.html
similarity index 100%
rename from question/questiontypes/rqp/editquestion.html
rename to question/type/rqp/editquestion.html
diff --git a/question/questiontypes/rqp/editquestion.php b/question/type/rqp/editquestion.php
similarity index 90%
rename from question/questiontypes/rqp/editquestion.php
rename to question/type/rqp/editquestion.php
index dd80d83833..c9e70a9982 100644
--- a/question/questiontypes/rqp/editquestion.php
+++ b/question/type/rqp/editquestion.php
@@ -1,6 +1,6 @@
 <?php // $Id$
 
-    require_once($CFG->dirroot . '/question/questiontypes/rqp/lib.php');
+    require_once($CFG->dirroot . '/question/type/rqp/lib.php');
 
     if (empty($question->id)) {
         if (!isset($typeid)) {
diff --git a/question/questiontypes/rqp/icon.gif b/question/type/rqp/icon.gif
similarity index 100%
rename from question/questiontypes/rqp/icon.gif
rename to question/type/rqp/icon.gif
diff --git a/question/questiontypes/rqp/lib.php b/question/type/rqp/lib.php
similarity index 100%
rename from question/questiontypes/rqp/lib.php
rename to question/type/rqp/lib.php
diff --git a/question/questiontypes/rqp/questiontype.php b/question/type/rqp/questiontype.php
similarity index 99%
rename from question/questiontypes/rqp/questiontype.php
rename to question/type/rqp/questiontype.php
index 3328b97d6e..d4d71ab27b 100644
--- a/question/questiontypes/rqp/questiontype.php
+++ b/question/type/rqp/questiontype.php
@@ -10,8 +10,8 @@
 * @package quiz
 */
 
-require_once($CFG->dirroot . '/question/questiontypes/rqp/lib.php');
-require_once($CFG->dirroot . '/question/questiontypes/rqp/remote.php');
+require_once($CFG->dirroot . '/question/type/rqp/lib.php');
+require_once($CFG->dirroot . '/question/type/rqp/remote.php');
 
 /**
 * RQP question type class
diff --git a/question/questiontypes/rqp/remote.php b/question/type/rqp/remote.php
similarity index 98%
rename from question/questiontypes/rqp/remote.php
rename to question/type/rqp/remote.php
index 75bfd45740..76e1c1cd17 100644
--- a/question/questiontypes/rqp/remote.php
+++ b/question/type/rqp/remote.php
@@ -10,7 +10,7 @@
 */
 
 // Load functions for the RQP-SOAP binding
-require_once($CFG->dirroot . '/question/questiontypes/rqp/rqp.php');
+require_once($CFG->dirroot . '/question/type/rqp/rqp.php');
 
 // Remote item processing flags (cached from server)
 define('REMOTE_TEMPLATE', 4);
diff --git a/question/questiontypes/rqp/rqp.php b/question/type/rqp/rqp.php
similarity index 100%
rename from question/questiontypes/rqp/rqp.php
rename to question/type/rqp/rqp.php
diff --git a/question/questiontypes/rqp/types.php b/question/type/rqp/types.php
similarity index 96%
rename from question/questiontypes/rqp/types.php
rename to question/type/rqp/types.php
index a38b6cb442..47be8a0629 100644
--- a/question/questiontypes/rqp/types.php
+++ b/question/type/rqp/types.php
@@ -4,8 +4,8 @@
 
     require_once('../../../../config.php');
     require_once($CFG->libdir.'/tablelib.php');
-    require_once($CFG->dirroot . '/question/questiontypes/rqp/lib.php');
-    require_once($CFG->dirroot . '/question/questiontypes/rqp/remote.php');
+    require_once($CFG->dirroot . '/question/type/rqp/lib.php');
+    require_once($CFG->dirroot . '/question/type/rqp/remote.php');
     
     $info = optional_param('info', 0, PARAM_INT); // id of server for which to show info
     $delete = optional_param('delete', 0, PARAM_INT); // id of server to delete
@@ -115,7 +115,7 @@
 
     $table->define_columns(array('name', 'url', 'action'));
     $table->define_headers(array(get_string('name'), get_string('serverurl', 'quiz'), get_string('action')));
-    $table->define_baseurl($CFG->wwwroot.'/question/questiontypes/rqp/types.php');
+    $table->define_baseurl($CFG->wwwroot.'/question/type/rqp/types.php');
 
     //$table->sortable(true);
 
diff --git a/question/questiontypes/rqp/version.php b/question/type/rqp/version.php
similarity index 100%
rename from question/questiontypes/rqp/version.php
rename to question/type/rqp/version.php
diff --git a/question/questiontypes/shortanswer/backuplib.php b/question/type/shortanswer/backuplib.php
similarity index 100%
rename from question/questiontypes/shortanswer/backuplib.php
rename to question/type/shortanswer/backuplib.php
diff --git a/question/questiontypes/shortanswer/db/mysql.php b/question/type/shortanswer/db/mysql.php
similarity index 78%
rename from question/questiontypes/shortanswer/db/mysql.php
rename to question/type/shortanswer/db/mysql.php
index a21e44f6ad..c8fe4afc13 100644
--- a/question/questiontypes/shortanswer/db/mysql.php
+++ b/question/type/shortanswer/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_shortanswer_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/shortanswer/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/shortanswer/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/shortanswer/db/mysql.sql b/question/type/shortanswer/db/mysql.sql
similarity index 100%
rename from question/questiontypes/shortanswer/db/mysql.sql
rename to question/type/shortanswer/db/mysql.sql
diff --git a/question/questiontypes/shortanswer/db/postgre7.php b/question/type/shortanswer/db/postgre7.php
similarity index 78%
rename from question/questiontypes/shortanswer/db/postgre7.php
rename to question/type/shortanswer/db/postgre7.php
index 51cbec7f27..fc35a8c62c 100644
--- a/question/questiontypes/shortanswer/db/postgre7.php
+++ b/question/type/shortanswer/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_shortanswer_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/shortanswer/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/shortanswer/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/shortanswer/db/postgre7.sql b/question/type/shortanswer/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/shortanswer/db/postgre7.sql
rename to question/type/shortanswer/db/postgre7.sql
diff --git a/question/questiontypes/shortanswer/display.html b/question/type/shortanswer/display.html
similarity index 100%
rename from question/questiontypes/shortanswer/display.html
rename to question/type/shortanswer/display.html
diff --git a/question/questiontypes/shortanswer/editquestion.html b/question/type/shortanswer/editquestion.html
similarity index 100%
rename from question/questiontypes/shortanswer/editquestion.html
rename to question/type/shortanswer/editquestion.html
diff --git a/question/questiontypes/shortanswer/editquestion.php b/question/type/shortanswer/editquestion.php
similarity index 90%
rename from question/questiontypes/shortanswer/editquestion.php
rename to question/type/shortanswer/editquestion.php
index 0c5767804e..85acb6287a 100644
--- a/question/questiontypes/shortanswer/editquestion.php
+++ b/question/type/shortanswer/editquestion.php
@@ -23,6 +23,6 @@
     }
 
     print_heading_with_help(get_string("editingshortanswer", "quiz"), "shortanswer", "quiz");
-    require("$CFG->dirroot/question/questiontypes/shortanswer/editquestion.html");
+    require("$CFG->dirroot/question/type/shortanswer/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/shortanswer/icon.gif b/question/type/shortanswer/icon.gif
similarity index 100%
rename from question/questiontypes/shortanswer/icon.gif
rename to question/type/shortanswer/icon.gif
diff --git a/question/questiontypes/shortanswer/questiontype.php b/question/type/shortanswer/questiontype.php
similarity index 99%
rename from question/questiontypes/shortanswer/questiontype.php
rename to question/type/shortanswer/questiontype.php
index 27543aa659..d2e1a631f9 100644
--- a/question/questiontypes/shortanswer/questiontype.php
+++ b/question/type/shortanswer/questiontype.php
@@ -163,7 +163,7 @@ class question_shortanswer_qtype extends default_questiontype {
                 }
             }
         }
-        include("$CFG->dirroot/question/questiontypes/shortanswer/display.html");
+        include("$CFG->dirroot/question/type/shortanswer/display.html");
     }
 
     // ULPGC ecastro
diff --git a/question/questiontypes/shortanswer/version.php b/question/type/shortanswer/version.php
similarity index 100%
rename from question/questiontypes/shortanswer/version.php
rename to question/type/shortanswer/version.php
diff --git a/question/questiontypes/truefalse/db/mysql.php b/question/type/truefalse/db/mysql.php
similarity index 78%
rename from question/questiontypes/truefalse/db/mysql.php
rename to question/type/truefalse/db/mysql.php
index 3a5a62b51f..4c182576c8 100644
--- a/question/questiontypes/truefalse/db/mysql.php
+++ b/question/type/truefalse/db/mysql.php
@@ -7,7 +7,7 @@ function qtype_truefalse_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/truefalse/db/mysql.sql");
+        $result = modify_database("$CFG->dirroot/question/type/truefalse/db/mysql.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/truefalse/db/mysql.sql b/question/type/truefalse/db/mysql.sql
similarity index 100%
rename from question/questiontypes/truefalse/db/mysql.sql
rename to question/type/truefalse/db/mysql.sql
diff --git a/question/questiontypes/truefalse/db/postgre7.php b/question/type/truefalse/db/postgre7.php
similarity index 78%
rename from question/questiontypes/truefalse/db/postgre7.php
rename to question/type/truefalse/db/postgre7.php
index 2f1cc01e6e..12564e71a7 100644
--- a/question/questiontypes/truefalse/db/postgre7.php
+++ b/question/type/truefalse/db/postgre7.php
@@ -7,7 +7,7 @@ function qtype_truefalse_upgrade($oldversion=0) {
 
 
     if ($oldversion == 0) { // First time install
-        $result = modify_database("$CFG->dirroot/question/questiontypes/truefalse/db/postgres7.sql");
+        $result = modify_database("$CFG->dirroot/question/type/truefalse/db/postgres7.sql");
         return $result;
     }
 
diff --git a/question/questiontypes/truefalse/db/postgre7.sql b/question/type/truefalse/db/postgre7.sql
similarity index 100%
rename from question/questiontypes/truefalse/db/postgre7.sql
rename to question/type/truefalse/db/postgre7.sql
diff --git a/question/questiontypes/truefalse/display.html b/question/type/truefalse/display.html
similarity index 100%
rename from question/questiontypes/truefalse/display.html
rename to question/type/truefalse/display.html
diff --git a/question/questiontypes/truefalse/editquestion.html b/question/type/truefalse/editquestion.html
similarity index 100%
rename from question/questiontypes/truefalse/editquestion.html
rename to question/type/truefalse/editquestion.html
diff --git a/question/questiontypes/truefalse/editquestion.php b/question/type/truefalse/editquestion.php
similarity index 90%
rename from question/questiontypes/truefalse/editquestion.php
rename to question/type/truefalse/editquestion.php
index 81a775c73e..7de8d98532 100644
--- a/question/questiontypes/truefalse/editquestion.php
+++ b/question/type/truefalse/editquestion.php
@@ -23,6 +23,6 @@
     }
 
     print_heading_with_help(get_string("editingtruefalse", "quiz"), "truefalse", "quiz");
-    require("$CFG->dirroot/question/questiontypes/truefalse/editquestion.html");
+    require("$CFG->dirroot/question/type/truefalse/editquestion.html");
 
 ?>
diff --git a/question/questiontypes/truefalse/icon.gif b/question/type/truefalse/icon.gif
similarity index 100%
rename from question/questiontypes/truefalse/icon.gif
rename to question/type/truefalse/icon.gif
diff --git a/question/questiontypes/truefalse/questiontype.php b/question/type/truefalse/questiontype.php
similarity index 99%
rename from question/questiontypes/truefalse/questiontype.php
rename to question/type/truefalse/questiontype.php
index 4b97325f53..1144a82e55 100644
--- a/question/questiontypes/truefalse/questiontype.php
+++ b/question/type/truefalse/questiontype.php
@@ -184,7 +184,7 @@ class question_truefalse_qtype extends default_questiontype {
             $feedback = format_text($chosenanswer->feedback, true, $formatoptions, $cmoptions->course);
         }
         
-        include("$CFG->dirroot/question/questiontypes/truefalse/display.html");
+        include("$CFG->dirroot/question/type/truefalse/display.html");
     }
 
     function grade_responses(&$question, &$state, $cmoptions) {
diff --git a/question/questiontypes/truefalse/version.php b/question/type/truefalse/version.php
similarity index 100%
rename from question/questiontypes/truefalse/version.php
rename to question/type/truefalse/version.php
-- 
2.39.5