From b007a5d04198cefa2da95d9200198888fce78fff Mon Sep 17 00:00:00 2001
From: Petr Skoda <commits@skodak.org>
Date: Sat, 17 Sep 2011 23:05:55 +0200
Subject: [PATCH] MDL-29029 move xmldb-editor to admin tools

AMOS BEGIN
 MOV [xmldbeditor,moodle],[pluginname,tool_xmldb]
 MOV [actual,core_xmldb],[actual,tool_xmldb]
 MOV [aftertable,core_xmldb],[aftertable,tool_xmldb]
 MOV [back,core_xmldb],[back,tool_xmldb]
 MOV [backtomainview,core_xmldb],[backtomainview,tool_xmldb]
 MOV [binaryincorrectlength,core_xmldb],[binaryincorrectlength,tool_xmldb]
 MOV [cannotuseidfield,core_xmldb],[cannotuseidfield,tool_xmldb]
 MOV [completelogbelow,core_xmldb],[completelogbelow,tool_xmldb]
 MOV [confirmdeletefield,core_xmldb],[confirmdeletefield,tool_xmldb]
 MOV [confirmdeleteindex,core_xmldb],[confirmdeleteindex,tool_xmldb]
 MOV [confirmdeletekey,core_xmldb],[confirmdeletekey,tool_xmldb]
 MOV [confirmdeletetable,core_xmldb],[confirmdeletetable,tool_xmldb]
 MOV [confirmdeletexmlfile,core_xmldb],[confirmdeletexmlfile,tool_xmldb]
 MOV [confirmcheckbigints,core_xmldb],[confirmcheckbigints,tool_xmldb]
 MOV [confirmcheckdefaults,core_xmldb],[confirmcheckdefaults,tool_xmldb]
 MOV [confirmcheckforeignkeys,core_xmldb],[confirmcheckforeignkeys,tool_xmldb]
 MOV [confirmcheckindexes,core_xmldb],[confirmcheckindexes,tool_xmldb]
 MOV [confirmrevertchanges,core_xmldb],[confirmrevertchanges,tool_xmldb]
 MOV [create,core_xmldb],[create,tool_xmldb]
 MOV [createtable,core_xmldb],[createtable,tool_xmldb]
 MOV [defaultincorrect,core_xmldb],[defaultincorrect,tool_xmldb]
 MOV [delete,core_xmldb],[delete,tool_xmldb]
 MOV [delete_field,core_xmldb],[delete_field,tool_xmldb]
 MOV [delete_index,core_xmldb],[delete_index,tool_xmldb]
 MOV [delete_key,core_xmldb],[delete_key,tool_xmldb]
 MOV [delete_table,core_xmldb],[delete_table,tool_xmldb]
 MOV [delete_xml_file,core_xmldb],[delete_xml_file,tool_xmldb]
 MOV [doc,core_xmldb],[doc,tool_xmldb]
 MOV [docindex,core_xmldb],[docindex,tool_xmldb]
 MOV [documentationintro,core_xmldb],[documentationintro,tool_xmldb]
 MOV [down,core_xmldb],[down,tool_xmldb]
 MOV [duplicate,core_xmldb],[duplicate,tool_xmldb]
 MOV [duplicatefieldname,core_xmldb],[duplicatefieldname,tool_xmldb]
 MOV [duplicatekeyname,core_xmldb],[duplicatekeyname,tool_xmldb]
 MOV [edit,core_xmldb],[edit,tool_xmldb]
 MOV [edit_field,core_xmldb],[edit_field,tool_xmldb]
 MOV [edit_field_save,core_xmldb],[edit_field_save,tool_xmldb]
 MOV [edit_index,core_xmldb],[edit_index,tool_xmldb]
 MOV [edit_index_save,core_xmldb],[edit_index_save,tool_xmldb]
 MOV [edit_key,core_xmldb],[edit_key,tool_xmldb]
 MOV [edit_key_save,core_xmldb],[edit_key_save,tool_xmldb]
 MOV [edit_table,core_xmldb],[edit_table,tool_xmldb]
 MOV [edit_table_save,core_xmldb],[edit_table_save,tool_xmldb]
 MOV [edit_xml_file,core_xmldb],[edit_xml_file,tool_xmldb]
 MOV [enumvaluesincorrect,core_xmldb],[enumvaluesincorrect,tool_xmldb]
 MOV [expected,core_xmldb],[expected,tool_xmldb]
 MOV [extensionrequired,core_xmldb],[extensionrequired,tool_xmldb]
 MOV [field,core_xmldb],[field,tool_xmldb]
 MOV [fieldnameempty,core_xmldb],[fieldnameempty,tool_xmldb]
 MOV [fields,core_xmldb],[fields,tool_xmldb]
 MOV [fieldsnotintable,core_xmldb],[fieldsnotintable,tool_xmldb]
 MOV [fieldsusedinkey,core_xmldb],[fieldsusedinkey,tool_xmldb]
 MOV [filenotwriteable,core_xmldb],[filenotwriteable,tool_xmldb]
 MOV [fkviolationdetails,core_xmldb],[fkviolationdetails,tool_xmldb]
 MOV [floatincorrectdecimals,core_xmldb],[floatincorrectdecimals,tool_xmldb]
 MOV [floatincorrectlength,core_xmldb],[floatincorrectlength,tool_xmldb]
 MOV [float2numbernote,core_xmldb],[float2numbernote,tool_xmldb]
 MOV [generate_all_documentation,core_xmldb],[generate_all_documentation,tool_xmldb]
 MOV [generate_documentation,core_xmldb],[generate_documentation,tool_xmldb]
 MOV [gotolastused,core_xmldb],[gotolastused,tool_xmldb]
 MOV [change,core_xmldb],[change,tool_xmldb]
 MOV [charincorrectlength,core_xmldb],[charincorrectlength,tool_xmldb]
 MOV [checkbigints,core_xmldb],[checkbigints,tool_xmldb]
 MOV [check_bigints,core_xmldb],[check_bigints,tool_xmldb]
 MOV [checkdefaults,core_xmldb],[checkdefaults,tool_xmldb]
 MOV [check_defaults,core_xmldb],[check_defaults,tool_xmldb]
 MOV [checkforeignkeys,core_xmldb],[checkforeignkeys,tool_xmldb]
 MOV [check_foreign_keys,core_xmldb],[check_foreign_keys,tool_xmldb]
 MOV [checkindexes,core_xmldb],[checkindexes,tool_xmldb]
 MOV [check_indexes,core_xmldb],[check_indexes,tool_xmldb]
 MOV [incorrectfieldname,core_xmldb],[incorrectfieldname,tool_xmldb]
 MOV [index,core_xmldb],[index,tool_xmldb]
 MOV [indexes,core_xmldb],[indexes,tool_xmldb]
 MOV [integerincorrectlength,core_xmldb],[integerincorrectlength,tool_xmldb]
 MOV [key,core_xmldb],[key,tool_xmldb]
 MOV [keys,core_xmldb],[keys,tool_xmldb]
 MOV [listreservedwords,core_xmldb],[listreservedwords,tool_xmldb]
 MOV [load,core_xmldb],[load,tool_xmldb]
 MOV [main_view,core_xmldb],[main_view,tool_xmldb]
 MOV [masterprimaryuniqueordernomatch,core_xmldb],[masterprimaryuniqueordernomatch,tool_xmldb]
 MOV [missing,core_xmldb],[missing,tool_xmldb]
 MOV [missingindexes,core_xmldb],[missingindexes,tool_xmldb]
 MOV [mustselectonefield,core_xmldb],[mustselectonefield,tool_xmldb]
 MOV [mustselectoneindex,core_xmldb],[mustselectoneindex,tool_xmldb]
 MOV [mustselectonekey,core_xmldb],[mustselectonekey,tool_xmldb]
 MOV [mysqlextracheckbigints,core_xmldb],[mysqlextracheckbigints,tool_xmldb]
 MOV [newfield,core_xmldb],[newfield,tool_xmldb]
 MOV [newindex,core_xmldb],[newindex,tool_xmldb]
 MOV [newkey,core_xmldb],[newkey,tool_xmldb]
 MOV [newtable,core_xmldb],[newtable,tool_xmldb]
 MOV [newtablefrommysql,core_xmldb],[newtablefrommysql,tool_xmldb]
 MOV [new_table_from_mysql,core_xmldb],[new_table_from_mysql,tool_xmldb]
 MOV [nomasterprimaryuniquefound,core_xmldb],[nomasterprimaryuniquefound,tool_xmldb]
 MOV [nomissingindexesfound,core_xmldb],[nomissingindexesfound,tool_xmldb]
 MOV [noviolatedforeignkeysfound,core_xmldb],[noviolatedforeignkeysfound,tool_xmldb]
 MOV [nowrongdefaultsfound,core_xmldb],[nowrongdefaultsfound,tool_xmldb]
 MOV [nowrongintsfound,core_xmldb],[nowrongintsfound,tool_xmldb]
 MOV [numberincorrectdecimals,core_xmldb],[numberincorrectdecimals,tool_xmldb]
 MOV [numberincorrectlength,core_xmldb],[numberincorrectlength,tool_xmldb]
 MOV [pendingchanges,core_xmldb],[pendingchanges,tool_xmldb]
 MOV [pendingchangescannotbesaved,core_xmldb],[pendingchangescannotbesaved,tool_xmldb]
 MOV [pendingchangescannotbesavedreload,core_xmldb],[pendingchangescannotbesavedreload,tool_xmldb]
 MOV [reserved,core_xmldb],[reserved,tool_xmldb]
 MOV [reservedwords,core_xmldb],[reservedwords,tool_xmldb]
 MOV [revert,core_xmldb],[revert,tool_xmldb]
 MOV [revert_changes,core_xmldb],[revert_changes,tool_xmldb]
 MOV [save,core_xmldb],[save,tool_xmldb]
 MOV [searchresults,core_xmldb],[searchresults,tool_xmldb]
 MOV [selectaction,core_xmldb],[selectaction,tool_xmldb]
 MOV [selectdb,core_xmldb],[selectdb,tool_xmldb]
 MOV [selectfieldkeyindex,core_xmldb],[selectfieldkeyindex,tool_xmldb]
 MOV [selectonecommand,core_xmldb],[selectonecommand,tool_xmldb]
 MOV [selectonefieldkeyindex,core_xmldb],[selectonefieldkeyindex,tool_xmldb]
 MOV [selecttable,core_xmldb],[selecttable,tool_xmldb]
 MOV [table,core_xmldb],[table,tool_xmldb]
 MOV [tables,core_xmldb],[tables,tool_xmldb]
 MOV [textincorrectlength,core_xmldb],[textincorrectlength,tool_xmldb]
 MOV [unload,core_xmldb],[unload,tool_xmldb]
 MOV [up,core_xmldb],[up,tool_xmldb]
 MOV [view,core_xmldb],[view,tool_xmldb]
 MOV [viewedited,core_xmldb],[viewedited,tool_xmldb]
 MOV [vieworiginal,core_xmldb],[vieworiginal,tool_xmldb]
 MOV [viewphpcode,core_xmldb],[viewphpcode,tool_xmldb]
 MOV [view_reserved_words,core_xmldb],[view_reserved_words,tool_xmldb]
 MOV [viewsqlcode,core_xmldb],[viewsqlcode,tool_xmldb]
 MOV [view_structure_php,core_xmldb],[view_structure_php,tool_xmldb]
 MOV [view_structure_sql,core_xmldb],[view_structure_sql,tool_xmldb]
 MOV [view_table_php,core_xmldb],[view_table_php,tool_xmldb]
 MOV [view_table_sql,core_xmldb],[view_table_sql,tool_xmldb]
 MOV [viewxml,core_xmldb],[viewxml,tool_xmldb]
 MOV [violatedforeignkeys,core_xmldb],[violatedforeignkeys,tool_xmldb]
 MOV [violatedforeignkeysfound,core_xmldb],[violatedforeignkeysfound,tool_xmldb]
 MOV [violations,core_xmldb],[violations,tool_xmldb]
 MOV [wrong,core_xmldb],[wrong,tool_xmldb]
 MOV [wrongdefaults,core_xmldb],[wrongdefaults,tool_xmldb]
 MOV [wrongints,core_xmldb],[wrongints,tool_xmldb]
 MOV [wronglengthforenum,core_xmldb],[wronglengthforenum,tool_xmldb]
 MOV [wrongreservedwords,core_xmldb],[wrongreservedwords,tool_xmldb]
 MOV [yesmissingindexesfound,core_xmldb],[yesmissingindexesfound,tool_xmldb]
 MOV [yeswrongdefaultsfound,core_xmldb],[yeswrongdefaultsfound,tool_xmldb]
 MOV [yeswrongintsfound,core_xmldb],[yeswrongintsfound,tool_xmldb]
AMOS END
---
 admin/settings/development.php                |  4 --
 admin/{ => tool}/xmldb/README.txt             |  0
 .../xmldb/actions/XMLDBAction.class.php       | 21 ++++---
 .../xmldb/actions/XMLDBCheckAction.class.php  | 29 ++++-----
 .../check_bigints/check_bigints.class.php     | 23 +++----
 .../check_defaults/check_defaults.class.php   | 25 ++++----
 .../check_foreign_keys.class.php              | 27 ++++----
 .../check_indexes/check_indexes.class.php     | 27 ++++----
 .../create_xml_file/create_xml_file.class.php | 50 ++++++++-------
 .../delete_field/delete_field.class.php       | 17 ++---
 .../delete_index/delete_index.class.php       | 17 ++---
 .../actions/delete_key/delete_key.class.php   | 17 ++---
 .../delete_table/delete_table.class.php       | 17 ++---
 .../delete_xml_file/delete_xml_file.class.php | 17 ++---
 .../actions/edit_field/edit_field.class.php   | 25 ++++----
 .../xmldb/actions/edit_field/edit_field.js    |  0
 .../edit_field_save/edit_field_save.class.php | 41 ++++++------
 .../actions/edit_index/edit_index.class.php   | 20 +++---
 .../edit_index_save/edit_index_save.class.php | 33 +++++-----
 .../xmldb/actions/edit_key/edit_key.class.php | 23 +++----
 .../xmldb/actions/edit_key/edit_key.js        |  0
 .../edit_key_save/edit_key_save.class.php     | 45 +++++++-------
 .../actions/edit_table/edit_table.class.php   | 57 ++++++++---------
 .../edit_table_save/edit_table_save.class.php | 23 +++----
 .../edit_xml_file/edit_xml_file.class.php     | 51 +++++++--------
 .../edit_xml_file_save.class.php              | 53 ++++++++--------
 .../generate_all_documentation.class.php      | 23 +++----
 .../generate_documentation.class.php          | 21 ++++---
 .../actions/generate_documentation/xmldb.xsl  |  0
 .../get_db_directories.class.php              | 15 ++---
 .../load_xml_file/load_xml_file.class.php     | 15 ++---
 .../load_xml_files/load_xml_files.class.php   | 53 ++++++++--------
 .../actions/main_view/main_view.class.php     | 47 +++++++-------
 .../move_updown_field.class.php               | 53 ++++++++--------
 .../move_updown_index.class.php               | 53 ++++++++--------
 .../move_updown_key/move_updown_key.class.php | 53 ++++++++--------
 .../move_updown_table.class.php               | 53 ++++++++--------
 .../actions/new_field/new_field.class.php     | 15 ++---
 .../actions/new_index/new_index.class.php     | 15 ++---
 .../xmldb/actions/new_key/new_key.class.php   | 15 ++---
 .../actions/new_table/new_table.class.php     | 15 ++---
 .../new_table_from_mysql.class.php            | 23 +++----
 .../revert_changes/revert_changes.class.php   | 17 ++---
 .../save_xml_file/save_xml_file.class.php     | 17 ++---
 .../xmldb/actions/template/template.class.php | 50 ++++++++-------
 .../unload_xml_file/unload_xml_file.class.php | 15 ++---
 .../view_field_xml/view_field_xml.class.php   | 15 ++---
 .../view_index_xml/view_index_xml.class.php   | 15 ++---
 .../view_key_xml/view_key_xml.class.php       | 15 ++---
 .../view_reserved_words.class.php             | 25 ++++----
 .../view_structure_php.class.php              | 23 +++----
 .../view_structure_sql.class.php              | 19 +++---
 .../view_structure_xml.class.php              | 15 ++---
 .../view_table_php/view_table_php.class.php   | 35 ++++++-----
 .../actions/view_table_php/view_table_php.js  |  0
 .../view_table_sql/view_table_sql.class.php   | 23 +++----
 .../view_table_xml/view_table_xml.class.php   | 15 ++---
 .../xmldb/actions/view_xml/view_xml.class.php | 15 ++---
 admin/{ => tool}/xmldb/index.php              | 62 +++++++++----------
 .../tool/xmldb/lang/en/tool_xmldb.php         | 11 ++--
 admin/tool/xmldb/settings.php                 | 30 +++++++++
 admin/tool/xmldb/version.php                  | 30 +++++++++
 lang/en/moodle.php                            |  1 -
 lib/moodlelib.php                             |  1 -
 lib/pluginlib.php                             |  2 +-
 65 files changed, 850 insertions(+), 732 deletions(-)
 rename admin/{ => tool}/xmldb/README.txt (100%)
 rename admin/{ => tool}/xmldb/actions/XMLDBAction.class.php (93%)
 rename admin/{ => tool}/xmldb/actions/XMLDBCheckAction.class.php (93%)
 rename admin/{ => tool}/xmldb/actions/check_bigints/check_bigints.class.php (91%)
 rename admin/{ => tool}/xmldb/actions/check_defaults/check_defaults.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/check_indexes/check_indexes.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/create_xml_file/create_xml_file.class.php (63%)
 rename admin/{ => tool}/xmldb/actions/delete_field/delete_field.class.php (92%)
 rename admin/{ => tool}/xmldb/actions/delete_index/delete_index.class.php (92%)
 rename admin/{ => tool}/xmldb/actions/delete_key/delete_key.class.php (92%)
 rename admin/{ => tool}/xmldb/actions/delete_table/delete_table.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/delete_xml_file/delete_xml_file.class.php (89%)
 rename admin/{ => tool}/xmldb/actions/edit_field/edit_field.class.php (94%)
 rename admin/{ => tool}/xmldb/actions/edit_field/edit_field.js (100%)
 rename admin/{ => tool}/xmldb/actions/edit_field_save/edit_field_save.class.php (91%)
 rename admin/{ => tool}/xmldb/actions/edit_index/edit_index.class.php (92%)
 rename admin/{ => tool}/xmldb/actions/edit_index_save/edit_index_save.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/edit_key/edit_key.class.php (93%)
 rename admin/{ => tool}/xmldb/actions/edit_key/edit_key.js (100%)
 rename admin/{ => tool}/xmldb/actions/edit_key_save/edit_key_save.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/edit_table/edit_table.class.php (94%)
 rename admin/{ => tool}/xmldb/actions/edit_table_save/edit_table_save.class.php (89%)
 rename admin/{ => tool}/xmldb/actions/edit_xml_file/edit_xml_file.class.php (91%)
 rename admin/{ => tool}/xmldb/actions/edit_xml_file_save/edit_xml_file_save.class.php (57%)
 rename admin/{ => tool}/xmldb/actions/generate_all_documentation/generate_all_documentation.class.php (85%)
 rename admin/{ => tool}/xmldb/actions/generate_documentation/generate_documentation.class.php (83%)
 rename admin/{ => tool}/xmldb/actions/generate_documentation/xmldb.xsl (100%)
 rename admin/{ => tool}/xmldb/actions/get_db_directories/get_db_directories.class.php (87%)
 rename admin/{ => tool}/xmldb/actions/load_xml_file/load_xml_file.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/load_xml_files/load_xml_files.class.php (58%)
 rename admin/{ => tool}/xmldb/actions/main_view/main_view.class.php (93%)
 rename admin/{ => tool}/xmldb/actions/move_updown_field/move_updown_field.class.php (70%)
 rename admin/{ => tool}/xmldb/actions/move_updown_index/move_updown_index.class.php (70%)
 rename admin/{ => tool}/xmldb/actions/move_updown_key/move_updown_key.class.php (70%)
 rename admin/{ => tool}/xmldb/actions/move_updown_table/move_updown_table.class.php (69%)
 rename admin/{ => tool}/xmldb/actions/new_field/new_field.class.php (88%)
 rename admin/{ => tool}/xmldb/actions/new_index/new_index.class.php (88%)
 rename admin/{ => tool}/xmldb/actions/new_key/new_key.class.php (88%)
 rename admin/{ => tool}/xmldb/actions/new_table/new_table.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php (92%)
 rename admin/{ => tool}/xmldb/actions/revert_changes/revert_changes.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/save_xml_file/save_xml_file.class.php (89%)
 rename admin/{ => tool}/xmldb/actions/template/template.class.php (52%)
 rename admin/{ => tool}/xmldb/actions/unload_xml_file/unload_xml_file.class.php (87%)
 rename admin/{ => tool}/xmldb/actions/view_field_xml/view_field_xml.class.php (91%)
 rename admin/{ => tool}/xmldb/actions/view_index_xml/view_index_xml.class.php (91%)
 rename admin/{ => tool}/xmldb/actions/view_key_xml/view_key_xml.class.php (91%)
 rename admin/{ => tool}/xmldb/actions/view_reserved_words/view_reserved_words.class.php (87%)
 rename admin/{ => tool}/xmldb/actions/view_structure_php/view_structure_php.class.php (95%)
 rename admin/{ => tool}/xmldb/actions/view_structure_sql/view_structure_sql.class.php (87%)
 rename admin/{ => tool}/xmldb/actions/view_structure_xml/view_structure_xml.class.php (89%)
 rename admin/{ => tool}/xmldb/actions/view_table_php/view_table_php.class.php (98%)
 rename admin/{ => tool}/xmldb/actions/view_table_php/view_table_php.js (100%)
 rename admin/{ => tool}/xmldb/actions/view_table_sql/view_table_sql.class.php (86%)
 rename admin/{ => tool}/xmldb/actions/view_table_xml/view_table_xml.class.php (90%)
 rename admin/{ => tool}/xmldb/actions/view_xml/view_xml.class.php (86%)
 rename admin/{ => tool}/xmldb/index.php (63%)
 rename lang/en/xmldb.php => admin/tool/xmldb/lang/en/tool_xmldb.php (97%)
 create mode 100644 admin/tool/xmldb/settings.php
 create mode 100644 admin/tool/xmldb/version.php

diff --git a/admin/settings/development.php b/admin/settings/development.php
index b1273b76dbb..609fadb813c 100644
--- a/admin/settings/development.php
+++ b/admin/settings/development.php
@@ -70,10 +70,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     }
 
 
-    // XMLDB editor
-    $ADMIN->add('development', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/"));
-
-
      // Web service test clients DO NOT COMMIT : THE EXTERNAL WEB PAGE IS NOT AN ADMIN PAGE !!!!!
     $ADMIN->add('development', new admin_externalpage('testclient', get_string('testclient', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/testclient.php"));
 
diff --git a/admin/xmldb/README.txt b/admin/tool/xmldb/README.txt
similarity index 100%
rename from admin/xmldb/README.txt
rename to admin/tool/xmldb/README.txt
diff --git a/admin/xmldb/actions/XMLDBAction.class.php b/admin/tool/xmldb/actions/XMLDBAction.class.php
similarity index 93%
rename from admin/xmldb/actions/XMLDBAction.class.php
rename to admin/tool/xmldb/actions/XMLDBAction.class.php
index f65e3a9beab..9d1aa343bb0 100644
--- a/admin/xmldb/actions/XMLDBAction.class.php
+++ b/admin/tool/xmldb/actions/XMLDBAction.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -27,9 +27,10 @@
  * Main xmldb action class. It implements all the basic
  * functionalities to be shared by each action.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class XMLDBAction {
 
@@ -126,8 +127,8 @@ class XMLDBAction {
      */
     function loadStrings($strings) {
     /// Load some commonly used strings
-        if (get_string_manager()->string_exists($this->title, 'xmldb')) {
-            $this->str['title'] = get_string($this->title, 'xmldb');
+        if (get_string_manager()->string_exists($this->title, 'tool_xmldb')) {
+            $this->str['title'] = get_string($this->title, 'tool_xmldb');
         } else {
             $this->str['title'] = $this->title;
         }
@@ -174,7 +175,7 @@ class XMLDBAction {
         global $CFG;
 
     /// Get the action path and invoke it
-        $actionsroot = "$CFG->dirroot/$CFG->admin/xmldb/actions";
+        $actionsroot = "$CFG->dirroot/$CFG->admin/tool/xmldb/actions";
         $actionclass = $action . '.class.php';
         $actionpath = "$actionsroot/$action/$actionclass";
 
diff --git a/admin/xmldb/actions/XMLDBCheckAction.class.php b/admin/tool/xmldb/actions/XMLDBCheckAction.class.php
similarity index 93%
rename from admin/xmldb/actions/XMLDBCheckAction.class.php
rename to admin/tool/xmldb/actions/XMLDBCheckAction.class.php
index feadac741da..0212c5d1253 100644
--- a/admin/xmldb/actions/XMLDBCheckAction.class.php
+++ b/admin/tool/xmldb/actions/XMLDBCheckAction.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2008 onwards Tim Hunt
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2008 onwards Tim Hunt
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This is a base class for the various actions that interate over all the
  * tables and check some aspect of their definition.
  *
- * @package   xmldb-editor
- * @copyright 2008 onwards Tim Hunt
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2008 onwards Tim Hunt
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class XMLDBCheckAction extends XMLDBAction {
     /**
@@ -48,17 +49,17 @@ abstract class XMLDBCheckAction extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            $this->introstr => 'xmldb',
+            $this->introstr => 'tool_xmldb',
             'ok' => '',
-            'wrong' => 'xmldb',
-            'table' => 'xmldb',
-            'field' => 'xmldb',
-            'searchresults' => 'xmldb',
-            'completelogbelow' => 'xmldb',
+            'wrong' => 'tool_xmldb',
+            'table' => 'tool_xmldb',
+            'field' => 'tool_xmldb',
+            'searchresults' => 'tool_xmldb',
+            'completelogbelow' => 'tool_xmldb',
             'yes' => '',
             'no' => '',
             'error' => '',
-            'back' => 'xmldb'
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/check_bigints/check_bigints.class.php b/admin/tool/xmldb/actions/check_bigints/check_bigints.class.php
similarity index 91%
rename from admin/xmldb/actions/check_bigints/check_bigints.class.php
rename to admin/tool/xmldb/actions/check_bigints/check_bigints.class.php
index 502b273777c..94f5c77b6db 100644
--- a/admin/xmldb/actions/check_bigints/check_bigints.class.php
+++ b/admin/tool/xmldb/actions/check_bigints/check_bigints.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -26,9 +26,10 @@
  * and providing one SQL script to fix all them. Also, under MySQL,
  * it performs one check of signed bigints. MDL-11038
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class check_bigints extends XMLDBCheckAction {
     private $correct_type;
@@ -49,10 +50,10 @@ class check_bigints extends XMLDBCheckAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'wrongints' => 'xmldb',
-            'nowrongintsfound' => 'xmldb',
-            'yeswrongintsfound' => 'xmldb',
-            'mysqlextracheckbigints' => 'xmldb',
+            'wrongints' => 'tool_xmldb',
+            'nowrongintsfound' => 'tool_xmldb',
+            'yeswrongintsfound' => 'tool_xmldb',
+            'mysqlextracheckbigints' => 'tool_xmldb',
         ));
 
     /// Correct fields must be type bigint for MySQL and int8 for PostgreSQL
diff --git a/admin/xmldb/actions/check_defaults/check_defaults.class.php b/admin/tool/xmldb/actions/check_defaults/check_defaults.class.php
similarity index 90%
rename from admin/xmldb/actions/check_defaults/check_defaults.class.php
rename to admin/tool/xmldb/actions/check_defaults/check_defaults.class.php
index 1cc78672f35..9e01ce3b104 100644
--- a/admin/xmldb/actions/check_defaults/check_defaults.class.php
+++ b/admin/tool/xmldb/actions/check_defaults/check_defaults.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -26,9 +26,10 @@
  * match those specified in the xml specs
  * and providing one SQL script to fix all them.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class check_defaults extends XMLDBCheckAction {
 
@@ -45,11 +46,11 @@ class check_defaults extends XMLDBCheckAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'wrongdefaults' => 'xmldb',
-            'nowrongdefaultsfound' => 'xmldb',
-            'yeswrongdefaultsfound' => 'xmldb',
-            'expected' => 'xmldb',
-            'actual' => 'xmldb',
+            'wrongdefaults' => 'tool_xmldb',
+            'nowrongdefaultsfound' => 'tool_xmldb',
+            'yeswrongdefaultsfound' => 'tool_xmldb',
+            'expected' => 'tool_xmldb',
+            'actual' => 'tool_xmldb',
         ));
     }
 
diff --git a/admin/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php b/admin/tool/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php
similarity index 90%
rename from admin/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php
rename to admin/tool/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php
index 19b11d658c7..078d7708e40 100644
--- a/admin/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php
+++ b/admin/tool/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -30,9 +30,10 @@
  * Each 0 in that column will violate the foreign key, but we ignore them.
  * If you want a strict check performed, then add &strict=1 to the URL.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class check_foreign_keys extends XMLDBCheckAction {
 
@@ -49,11 +50,11 @@ class check_foreign_keys extends XMLDBCheckAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'key' => 'xmldb',
-            'violatedforeignkeys' => 'xmldb',
-            'noviolatedforeignkeysfound' => 'xmldb',
-            'violatedforeignkeysfound' => 'xmldb',
-            'violations' => 'xmldb',
+            'key' => 'tool_xmldb',
+            'violatedforeignkeys' => 'tool_xmldb',
+            'noviolatedforeignkeysfound' => 'tool_xmldb',
+            'violatedforeignkeysfound' => 'tool_xmldb',
+            'violations' => 'tool_xmldb',
         ));
     }
 
@@ -146,7 +147,7 @@ class check_foreign_keys extends XMLDBCheckAction {
                 $violation->tablename = $violation->table->getName();
                 $violation->keyname = $violation->key->getName();
 
-                $r.= '            <li>' .get_string('fkviolationdetails', 'xmldb', $violation) .
+                $r.= '            <li>' .get_string('fkviolationdetails', 'tool_xmldb', $violation) .
                         '<pre>' . s($violation->sql) . '; ' . s($violation->sqlparams) . '</pre></li>';
             }
             $r.= '        </ul>';
diff --git a/admin/xmldb/actions/check_indexes/check_indexes.class.php b/admin/tool/xmldb/actions/check_indexes/check_indexes.class.php
similarity index 90%
rename from admin/xmldb/actions/check_indexes/check_indexes.class.php
rename to admin/tool/xmldb/actions/check_indexes/check_indexes.class.php
index a2721a225b6..fd3ed213608 100644
--- a/admin/xmldb/actions/check_indexes/check_indexes.class.php
+++ b/admin/tool/xmldb/actions/check_indexes/check_indexes.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -26,9 +26,10 @@
  * with the physical DB implementation, reporting about all the missing
  * indexes to be created to be 100% ok.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class check_indexes extends XMLDBCheckAction {
 
@@ -45,12 +46,12 @@ class check_indexes extends XMLDBCheckAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'missing' => 'xmldb',
-            'key' => 'xmldb',
-            'index' => 'xmldb',
-            'missingindexes' => 'xmldb',
-            'nomissingindexesfound' => 'xmldb',
-            'yesmissingindexesfound' => 'xmldb',
+            'missing' => 'tool_xmldb',
+            'key' => 'tool_xmldb',
+            'index' => 'tool_xmldb',
+            'missingindexes' => 'tool_xmldb',
+            'nomissingindexesfound' => 'tool_xmldb',
+            'yesmissingindexesfound' => 'tool_xmldb',
         ));
     }
 
diff --git a/admin/xmldb/actions/create_xml_file/create_xml_file.class.php b/admin/tool/xmldb/actions/create_xml_file/create_xml_file.class.php
similarity index 63%
rename from admin/xmldb/actions/create_xml_file/create_xml_file.class.php
rename to admin/tool/xmldb/actions/create_xml_file/create_xml_file.class.php
index 1ef91c85e55..d2fcf30cf0e 100644
--- a/admin/xmldb/actions/create_xml_file/create_xml_file.class.php
+++ b/admin/tool/xmldb/actions/create_xml_file/create_xml_file.class.php
@@ -1,30 +1,32 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
-/// This class will
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class create_xml_file extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/delete_field/delete_field.class.php b/admin/tool/xmldb/actions/delete_field/delete_field.class.php
similarity index 92%
rename from admin/xmldb/actions/delete_field/delete_field.class.php
rename to admin/tool/xmldb/actions/delete_field/delete_field.class.php
index ca292d29de7..d8015e2835e 100644
--- a/admin/xmldb/actions/delete_field/delete_field.class.php
+++ b/admin/tool/xmldb/actions/delete_field/delete_field.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will delete completely one field
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class delete_field extends XMLDBAction {
 
@@ -40,7 +41,7 @@ class delete_field extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'confirmdeletefield' => 'xmldb',
+            'confirmdeletefield' => 'tool_xmldb',
             'yes' => '',
             'no' => ''
         ));
diff --git a/admin/xmldb/actions/delete_index/delete_index.class.php b/admin/tool/xmldb/actions/delete_index/delete_index.class.php
similarity index 92%
rename from admin/xmldb/actions/delete_index/delete_index.class.php
rename to admin/tool/xmldb/actions/delete_index/delete_index.class.php
index d400ebedae5..465b5dbafc3 100644
--- a/admin/xmldb/actions/delete_index/delete_index.class.php
+++ b/admin/tool/xmldb/actions/delete_index/delete_index.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will delete completely one index
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class delete_index extends XMLDBAction {
 
@@ -40,7 +41,7 @@ class delete_index extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'confirmdeleteindex' => 'xmldb',
+            'confirmdeleteindex' => 'tool_xmldb',
             'yes' => '',
             'no' => ''
         ));
diff --git a/admin/xmldb/actions/delete_key/delete_key.class.php b/admin/tool/xmldb/actions/delete_key/delete_key.class.php
similarity index 92%
rename from admin/xmldb/actions/delete_key/delete_key.class.php
rename to admin/tool/xmldb/actions/delete_key/delete_key.class.php
index f37946d7ce7..409307a843f 100644
--- a/admin/xmldb/actions/delete_key/delete_key.class.php
+++ b/admin/tool/xmldb/actions/delete_key/delete_key.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will delete completely one key
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class delete_key extends XMLDBAction {
 
@@ -40,7 +41,7 @@ class delete_key extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'confirmdeletekey' => 'xmldb',
+            'confirmdeletekey' => 'tool_xmldb',
             'yes' => '',
             'no' => ''
         ));
diff --git a/admin/xmldb/actions/delete_table/delete_table.class.php b/admin/tool/xmldb/actions/delete_table/delete_table.class.php
similarity index 90%
rename from admin/xmldb/actions/delete_table/delete_table.class.php
rename to admin/tool/xmldb/actions/delete_table/delete_table.class.php
index 08c27b1d64c..9d49fc92002 100644
--- a/admin/xmldb/actions/delete_table/delete_table.class.php
+++ b/admin/tool/xmldb/actions/delete_table/delete_table.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will delete completely one table
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class delete_table extends XMLDBAction {
 
@@ -40,7 +41,7 @@ class delete_table extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'confirmdeletetable' => 'xmldb',
+            'confirmdeletetable' => 'tool_xmldb',
             'yes' => '',
             'no' => ''
         ));
diff --git a/admin/xmldb/actions/delete_xml_file/delete_xml_file.class.php b/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php
similarity index 89%
rename from admin/xmldb/actions/delete_xml_file/delete_xml_file.class.php
rename to admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php
index a8848fcb723..d4531b78f5a 100644
--- a/admin/xmldb/actions/delete_xml_file/delete_xml_file.class.php
+++ b/admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will delete completely one XML file
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class delete_xml_file extends XMLDBAction {
 
@@ -40,7 +41,7 @@ class delete_xml_file extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'confirmdeletexmlfile' => 'xmldb',
+            'confirmdeletexmlfile' => 'tool_xmldb',
             'yes' => '',
             'no' => ''
         ));
diff --git a/admin/xmldb/actions/edit_field/edit_field.class.php b/admin/tool/xmldb/actions/edit_field/edit_field.class.php
similarity index 94%
rename from admin/xmldb/actions/edit_field/edit_field.class.php
rename to admin/tool/xmldb/actions/edit_field/edit_field.class.php
index d812f973bb6..197baf60fd6 100644
--- a/admin/xmldb/actions/edit_field/edit_field.class.php
+++ b/admin/tool/xmldb/actions/edit_field/edit_field.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will provide the interface for all the edit field actions
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_field extends XMLDBAction {
 
@@ -41,13 +42,13 @@ class edit_field extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'change' => 'xmldb',
-            'float2numbernote' => 'xmldb',
-            'vieworiginal' => 'xmldb',
-            'viewedited' => 'xmldb',
+            'change' => 'tool_xmldb',
+            'float2numbernote' => 'tool_xmldb',
+            'vieworiginal' => 'tool_xmldb',
+            'viewedited' => 'tool_xmldb',
             'yes' => '',
             'no' => '',
-            'back' => 'xmldb'
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/edit_field/edit_field.js b/admin/tool/xmldb/actions/edit_field/edit_field.js
similarity index 100%
rename from admin/xmldb/actions/edit_field/edit_field.js
rename to admin/tool/xmldb/actions/edit_field/edit_field.js
diff --git a/admin/xmldb/actions/edit_field_save/edit_field_save.class.php b/admin/tool/xmldb/actions/edit_field_save/edit_field_save.class.php
similarity index 91%
rename from admin/xmldb/actions/edit_field_save/edit_field_save.class.php
rename to admin/tool/xmldb/actions/edit_field_save/edit_field_save.class.php
index b762063bd7d..1ab523affac 100644
--- a/admin/xmldb/actions/edit_field_save/edit_field_save.class.php
+++ b/admin/tool/xmldb/actions/edit_field_save/edit_field_save.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class verifies all the data introduced when editing a field for correctness,
  * performing changes / displaying errors depending of the results.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_field_save extends XMLDBAction {
 
@@ -41,19 +42,19 @@ class edit_field_save extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'fieldnameempty' => 'xmldb',
-            'incorrectfieldname' => 'xmldb',
-            'duplicatefieldname' => 'xmldb',
-            'integerincorrectlength' => 'xmldb',
-            'numberincorrectlength' => 'xmldb',
-            'floatincorrectlength' => 'xmldb',
-            'charincorrectlength' => 'xmldb',
-            'textincorrectlength' => 'xmldb',
-            'binaryincorrectlength' => 'xmldb',
-            'numberincorrectdecimals' => 'xmldb',
-            'floatincorrectdecimals' => 'xmldb',
-            'defaultincorrect' => 'xmldb',
-            'back' => 'xmldb',
+            'fieldnameempty' => 'tool_xmldb',
+            'incorrectfieldname' => 'tool_xmldb',
+            'duplicatefieldname' => 'tool_xmldb',
+            'integerincorrectlength' => 'tool_xmldb',
+            'numberincorrectlength' => 'tool_xmldb',
+            'floatincorrectlength' => 'tool_xmldb',
+            'charincorrectlength' => 'tool_xmldb',
+            'textincorrectlength' => 'tool_xmldb',
+            'binaryincorrectlength' => 'tool_xmldb',
+            'numberincorrectdecimals' => 'tool_xmldb',
+            'floatincorrectdecimals' => 'tool_xmldb',
+            'defaultincorrect' => 'tool_xmldb',
+            'back' => 'tool_xmldb',
             'administration' => ''
         ));
     }
diff --git a/admin/xmldb/actions/edit_index/edit_index.class.php b/admin/tool/xmldb/actions/edit_index/edit_index.class.php
similarity index 92%
rename from admin/xmldb/actions/edit_index/edit_index.class.php
rename to admin/tool/xmldb/actions/edit_index/edit_index.class.php
index ea0b309db4d..54ac3cb2ff7 100644
--- a/admin/xmldb/actions/edit_index/edit_index.class.php
+++ b/admin/tool/xmldb/actions/edit_index/edit_index.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,18 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will provide the interface for all the edit index actions
  *
  * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_index extends XMLDBAction {
 
@@ -41,12 +41,12 @@ class edit_index extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'change' => 'xmldb',
-            'vieworiginal' => 'xmldb',
-            'viewedited' => 'xmldb',
+            'change' => 'tool_xmldb',
+            'vieworiginal' => 'tool_xmldb',
+            'viewedited' => 'tool_xmldb',
             'yes' => '',
             'no' => '',
-            'back' => 'xmldb'
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/edit_index_save/edit_index_save.class.php b/admin/tool/xmldb/actions/edit_index_save/edit_index_save.class.php
similarity index 90%
rename from admin/xmldb/actions/edit_index_save/edit_index_save.class.php
rename to admin/tool/xmldb/actions/edit_index_save/edit_index_save.class.php
index afcdb22b733..a39106c834f 100644
--- a/admin/xmldb/actions/edit_index_save/edit_index_save.class.php
+++ b/admin/tool/xmldb/actions/edit_index_save/edit_index_save.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class verifies all the data introduced when editing an index for correctness,
  * performing changes / displaying errors depending of the results.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_index_save extends XMLDBAction {
 
@@ -41,15 +42,15 @@ class edit_index_save extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'indexnameempty' => 'xmldb',
-            'incorrectindexname' => 'xmldb',
-            'duplicateindexname' => 'xmldb',
-            'nofieldsspecified' => 'xmldb',
-            'duplicatefieldsused' => 'xmldb',
-            'fieldsnotintable' => 'xmldb',
-            'fieldsusedinkey' => 'xmldb',
-            'fieldsusedinindex' => 'xmldb',
-            'back' => 'xmldb',
+            'indexnameempty' => 'tool_xmldb',
+            'incorrectindexname' => 'tool_xmldb',
+            'duplicateindexname' => 'tool_xmldb',
+            'nofieldsspecified' => 'tool_xmldb',
+            'duplicatefieldsused' => 'tool_xmldb',
+            'fieldsnotintable' => 'tool_xmldb',
+            'fieldsusedinkey' => 'tool_xmldb',
+            'fieldsusedinindex' => 'tool_xmldb',
+            'back' => 'tool_xmldb',
             'administration' => ''
         ));
     }
diff --git a/admin/xmldb/actions/edit_key/edit_key.class.php b/admin/tool/xmldb/actions/edit_key/edit_key.class.php
similarity index 93%
rename from admin/xmldb/actions/edit_key/edit_key.class.php
rename to admin/tool/xmldb/actions/edit_key/edit_key.class.php
index 88cb746cc16..e38e7c0ae2c 100644
--- a/admin/xmldb/actions/edit_key/edit_key.class.php
+++ b/admin/tool/xmldb/actions/edit_key/edit_key.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will provide the interface for all the edit key actions
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_key extends XMLDBAction {
 
@@ -41,12 +42,12 @@ class edit_key extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'change' => 'xmldb',
-            'vieworiginal' => 'xmldb',
-            'viewedited' => 'xmldb',
+            'change' => 'tool_xmldb',
+            'vieworiginal' => 'tool_xmldb',
+            'viewedited' => 'tool_xmldb',
             'yes' => '',
             'no' => '',
-            'back' => 'xmldb'
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/edit_key/edit_key.js b/admin/tool/xmldb/actions/edit_key/edit_key.js
similarity index 100%
rename from admin/xmldb/actions/edit_key/edit_key.js
rename to admin/tool/xmldb/actions/edit_key/edit_key.js
diff --git a/admin/xmldb/actions/edit_key_save/edit_key_save.class.php b/admin/tool/xmldb/actions/edit_key_save/edit_key_save.class.php
similarity index 90%
rename from admin/xmldb/actions/edit_key_save/edit_key_save.class.php
rename to admin/tool/xmldb/actions/edit_key_save/edit_key_save.class.php
index 25f3f01095e..0372d515395 100644
--- a/admin/xmldb/actions/edit_key_save/edit_key_save.class.php
+++ b/admin/tool/xmldb/actions/edit_key_save/edit_key_save.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class verifies all the data introduced when editing a key for correctness,
  * performing changes / displaying errors depending of the results.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_key_save extends XMLDBAction {
 
@@ -41,21 +42,21 @@ class edit_key_save extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'keynameempty' => 'xmldb',
-            'incorrectkeyname' => 'xmldb',
-            'duplicatekeyname' => 'xmldb',
-            'nofieldsspecified' => 'xmldb',
-            'duplicatefieldsused' => 'xmldb',
-            'fieldsnotintable' => 'xmldb',
-            'fieldsusedinkey' => 'xmldb',
-            'fieldsusedinindex' => 'xmldb',
-            'noreftablespecified' => 'xmldb',
-            'wrongnumberofreffields' => 'xmldb',
-            'noreffieldsspecified' => 'xmldb',
-            'nomasterprimaryuniquefound' => 'xmldb',
-            'masterprimaryuniqueordernomatch' => 'xmldb',
-            'primarykeyonlyallownotnullfields' => 'xmldb',
-            'back' => 'xmldb',
+            'keynameempty' => 'tool_xmldb',
+            'incorrectkeyname' => 'tool_xmldb',
+            'duplicatekeyname' => 'tool_xmldb',
+            'nofieldsspecified' => 'tool_xmldb',
+            'duplicatefieldsused' => 'tool_xmldb',
+            'fieldsnotintable' => 'tool_xmldb',
+            'fieldsusedinkey' => 'tool_xmldb',
+            'fieldsusedinindex' => 'tool_xmldb',
+            'noreftablespecified' => 'tool_xmldb',
+            'wrongnumberofreffields' => 'tool_xmldb',
+            'noreffieldsspecified' => 'tool_xmldb',
+            'nomasterprimaryuniquefound' => 'tool_xmldb',
+            'masterprimaryuniqueordernomatch' => 'tool_xmldb',
+            'primarykeyonlyallownotnullfields' => 'tool_xmldb',
+            'back' => 'tool_xmldb',
             'administration' => ''
         ));
     }
diff --git a/admin/xmldb/actions/edit_table/edit_table.class.php b/admin/tool/xmldb/actions/edit_table/edit_table.class.php
similarity index 94%
rename from admin/xmldb/actions/edit_table/edit_table.class.php
rename to admin/tool/xmldb/actions/edit_table/edit_table.class.php
index 70b87d9a0d4..d9bde5d9cbf 100644
--- a/admin/xmldb/actions/edit_table/edit_table.class.php
+++ b/admin/tool/xmldb/actions/edit_table/edit_table.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -28,9 +28,10 @@
  * can be invoked, plus links to PHP code generator, view SQL, rearrange
  * elements and so on.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_table extends XMLDBAction {
 
@@ -45,27 +46,27 @@ class edit_table extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'change' => 'xmldb',
-            'vieworiginal' => 'xmldb',
-            'viewedited' => 'xmldb',
-            'viewsqlcode' => 'xmldb',
-            'viewphpcode' => 'xmldb',
-            'newfield' => 'xmldb',
-            'newkey' => 'xmldb',
-            'newindex' => 'xmldb',
-            'fields' => 'xmldb',
-            'keys' => 'xmldb',
-            'indexes' => 'xmldb',
-            'edit' => 'xmldb',
-            'up' => 'xmldb',
-            'down' => 'xmldb',
-            'delete' => 'xmldb',
-            'reserved' => 'xmldb',
-            'back' => 'xmldb',
-            'viewxml' => 'xmldb',
-            'pendingchanges' => 'xmldb',
-            'pendingchangescannotbesaved' => 'xmldb',
-            'save' => 'xmldb'
+            'change' => 'tool_xmldb',
+            'vieworiginal' => 'tool_xmldb',
+            'viewedited' => 'tool_xmldb',
+            'viewsqlcode' => 'tool_xmldb',
+            'viewphpcode' => 'tool_xmldb',
+            'newfield' => 'tool_xmldb',
+            'newkey' => 'tool_xmldb',
+            'newindex' => 'tool_xmldb',
+            'fields' => 'tool_xmldb',
+            'keys' => 'tool_xmldb',
+            'indexes' => 'tool_xmldb',
+            'edit' => 'tool_xmldb',
+            'up' => 'tool_xmldb',
+            'down' => 'tool_xmldb',
+            'delete' => 'tool_xmldb',
+            'reserved' => 'tool_xmldb',
+            'back' => 'tool_xmldb',
+            'viewxml' => 'tool_xmldb',
+            'pendingchanges' => 'tool_xmldb',
+            'pendingchangescannotbesaved' => 'tool_xmldb',
+            'save' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/edit_table_save/edit_table_save.class.php b/admin/tool/xmldb/actions/edit_table_save/edit_table_save.class.php
similarity index 89%
rename from admin/xmldb/actions/edit_table_save/edit_table_save.class.php
rename to admin/tool/xmldb/actions/edit_table_save/edit_table_save.class.php
index 4c273da3dfc..77c8669eb12 100644
--- a/admin/xmldb/actions/edit_table_save/edit_table_save.class.php
+++ b/admin/tool/xmldb/actions/edit_table_save/edit_table_save.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will save changes in table name and/or comments
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_table_save extends XMLDBAction {
 
@@ -40,10 +41,10 @@ class edit_table_save extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'tablenameempty' => 'xmldb',
-            'incorrecttablename' => 'xmldb',
-            'duplicatetablename' => 'xmldb',
-            'back' => 'xmldb',
+            'tablenameempty' => 'tool_xmldb',
+            'incorrecttablename' => 'tool_xmldb',
+            'duplicatetablename' => 'tool_xmldb',
+            'back' => 'tool_xmldb',
             'administration' => ''
         ));
     }
diff --git a/admin/xmldb/actions/edit_xml_file/edit_xml_file.class.php b/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php
similarity index 91%
rename from admin/xmldb/actions/edit_xml_file/edit_xml_file.class.php
rename to admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php
index f7394d913ae..35557c14df6 100644
--- a/admin/xmldb/actions/edit_xml_file/edit_xml_file.class.php
+++ b/admin/tool/xmldb/actions/edit_xml_file/edit_xml_file.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -27,9 +27,10 @@
  * Main page to start editing one XML file. From here it's possible to access
  * to tables edition plus PHP code generation and other utilities
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class edit_xml_file extends XMLDBAction {
 
@@ -44,24 +45,24 @@ class edit_xml_file extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'change' => 'xmldb',
-            'edit' => 'xmldb',
-            'up' => 'xmldb',
-            'down' => 'xmldb',
-            'delete' => 'xmldb',
-            'vieworiginal' => 'xmldb',
-            'viewedited' => 'xmldb',
-            'tables' => 'xmldb',
-            'newtable' => 'xmldb',
-            'newtablefrommysql' => 'xmldb',
-            'viewsqlcode' => 'xmldb',
-            'viewphpcode' => 'xmldb',
-            'reserved' => 'xmldb',
-            'backtomainview' => 'xmldb',
-            'viewxml' => 'xmldb',
-            'pendingchanges' => 'xmldb',
-            'pendingchangescannotbesaved' => 'xmldb',
-            'save' => 'xmldb'
+            'change' => 'tool_xmldb',
+            'edit' => 'tool_xmldb',
+            'up' => 'tool_xmldb',
+            'down' => 'tool_xmldb',
+            'delete' => 'tool_xmldb',
+            'vieworiginal' => 'tool_xmldb',
+            'viewedited' => 'tool_xmldb',
+            'tables' => 'tool_xmldb',
+            'newtable' => 'tool_xmldb',
+            'newtablefrommysql' => 'tool_xmldb',
+            'viewsqlcode' => 'tool_xmldb',
+            'viewphpcode' => 'tool_xmldb',
+            'reserved' => 'tool_xmldb',
+            'backtomainview' => 'tool_xmldb',
+            'viewxml' => 'tool_xmldb',
+            'pendingchanges' => 'tool_xmldb',
+            'pendingchangescannotbesaved' => 'tool_xmldb',
+            'save' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/edit_xml_file_save/edit_xml_file_save.class.php b/admin/tool/xmldb/actions/edit_xml_file_save/edit_xml_file_save.class.php
similarity index 57%
rename from admin/xmldb/actions/edit_xml_file_save/edit_xml_file_save.class.php
rename to admin/tool/xmldb/actions/edit_xml_file_save/edit_xml_file_save.class.php
index 9319bbc678b..ace809e6933 100644
--- a/admin/xmldb/actions/edit_xml_file_save/edit_xml_file_save.class.php
+++ b/admin/tool/xmldb/actions/edit_xml_file_save/edit_xml_file_save.class.php
@@ -1,31 +1,34 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will save the changes performed to the comment of one file
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
+/**
+ * This class will save the changes performed to the comment of one file
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class edit_xml_file_save extends XMLDBAction {
 
     /**
diff --git a/admin/xmldb/actions/generate_all_documentation/generate_all_documentation.class.php b/admin/tool/xmldb/actions/generate_all_documentation/generate_all_documentation.class.php
similarity index 85%
rename from admin/xmldb/actions/generate_all_documentation/generate_all_documentation.class.php
rename to admin/tool/xmldb/actions/generate_all_documentation/generate_all_documentation.class.php
index 3f36b307925..8865a57c6e0 100644
--- a/admin/xmldb/actions/generate_all_documentation/generate_all_documentation.class.php
+++ b/admin/tool/xmldb/actions/generate_all_documentation/generate_all_documentation.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright (C) 2001-3001 Eloy Lafuente (stronk7) {@link http://contiento.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  (C) 2001-3001 Eloy Lafuente (stronk7) {@link http://contiento.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will produce the documentation for all the XMLDB files in the server,
  * via XSL, performing the output in HTML format.
  *
- * @package   xmldb-editor
- * @copyright (C) 2001-3001 Eloy Lafuente (stronk7) {@link http://contiento.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  (C) 2001-3001 Eloy Lafuente (stronk7) {@link http://contiento.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class generate_all_documentation extends XMLDBAction {
 
@@ -42,9 +43,9 @@ class generate_all_documentation extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'backtomainview' => 'xmldb',
-            'documentationintro' => 'xmldb',
-            'docindex' => 'xmldb'
+            'backtomainview' => 'tool_xmldb',
+            'documentationintro' => 'tool_xmldb',
+            'docindex' => 'tool_xmldb'
         ));
     }
 
@@ -111,7 +112,7 @@ class generate_all_documentation extends XMLDBAction {
 
             $this->output.=$b;
         } else {
-            $this->output.=get_string('extensionrequired','xmldb','xsl');
+            $this->output.=get_string('extensionrequired','tool_xmldb','xsl');
         }
 
     /// Launch postaction if exists (leave this unmodified)
diff --git a/admin/xmldb/actions/generate_documentation/generate_documentation.class.php b/admin/tool/xmldb/actions/generate_documentation/generate_documentation.class.php
similarity index 83%
rename from admin/xmldb/actions/generate_documentation/generate_documentation.class.php
rename to admin/tool/xmldb/actions/generate_documentation/generate_documentation.class.php
index 5bdcf8ea952..d4373b65b71 100644
--- a/admin/xmldb/actions/generate_documentation/generate_documentation.class.php
+++ b/admin/tool/xmldb/actions/generate_documentation/generate_documentation.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will produce XSL documentation for the loaded XML file
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class generate_documentation extends XMLDBAction {
 
@@ -41,8 +42,8 @@ class generate_documentation extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'backtomainview' => 'xmldb',
-            'documentationintro' => 'xmldb'
+            'backtomainview' => 'tool_xmldb',
+            'documentationintro' => 'tool_xmldb'
         ));
     }
 
@@ -95,7 +96,7 @@ class generate_documentation extends XMLDBAction {
             $this->output.=$xsl->transformToXML($doc);
             $this->output.=$b;
         } else {
-            $this->output.=get_string('extensionrequired','xmldb','xsl');
+            $this->output.=get_string('extensionrequired','tool_xmldb','xsl');
         }
 
     /// Launch postaction if exists (leave this unmodified)
diff --git a/admin/xmldb/actions/generate_documentation/xmldb.xsl b/admin/tool/xmldb/actions/generate_documentation/xmldb.xsl
similarity index 100%
rename from admin/xmldb/actions/generate_documentation/xmldb.xsl
rename to admin/tool/xmldb/actions/generate_documentation/xmldb.xsl
diff --git a/admin/xmldb/actions/get_db_directories/get_db_directories.class.php b/admin/tool/xmldb/actions/get_db_directories/get_db_directories.class.php
similarity index 87%
rename from admin/xmldb/actions/get_db_directories/get_db_directories.class.php
rename to admin/tool/xmldb/actions/get_db_directories/get_db_directories.class.php
index 1d8fa1954a1..b820e148af8 100644
--- a/admin/xmldb/actions/get_db_directories/get_db_directories.class.php
+++ b/admin/tool/xmldb/actions/get_db_directories/get_db_directories.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will will check all the db directories existing under the
  * current Moodle installation, sending them to the SESSION->dbdirs array
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class get_db_directories extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/load_xml_file/load_xml_file.class.php b/admin/tool/xmldb/actions/load_xml_file/load_xml_file.class.php
similarity index 90%
rename from admin/xmldb/actions/load_xml_file/load_xml_file.class.php
rename to admin/tool/xmldb/actions/load_xml_file/load_xml_file.class.php
index c74c2df0a5c..a34cd03a443 100644
--- a/admin/xmldb/actions/load_xml_file/load_xml_file.class.php
+++ b/admin/tool/xmldb/actions/load_xml_file/load_xml_file.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will load one XML file to memory if necessary
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class load_xml_file extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/load_xml_files/load_xml_files.class.php b/admin/tool/xmldb/actions/load_xml_files/load_xml_files.class.php
similarity index 58%
rename from admin/xmldb/actions/load_xml_files/load_xml_files.class.php
rename to admin/tool/xmldb/actions/load_xml_files/load_xml_files.class.php
index 851495060bb..4c0b9baa034 100644
--- a/admin/xmldb/actions/load_xml_files/load_xml_files.class.php
+++ b/admin/tool/xmldb/actions/load_xml_files/load_xml_files.class.php
@@ -1,31 +1,34 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas     http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will load every XML file to memory if necessary
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
+/**
+ * This class will load every XML file to memory if necessary
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class load_xml_files extends XMLDBAction {
 
     /**
diff --git a/admin/xmldb/actions/main_view/main_view.class.php b/admin/tool/xmldb/actions/main_view/main_view.class.php
similarity index 93%
rename from admin/xmldb/actions/main_view/main_view.class.php
rename to admin/tool/xmldb/actions/main_view/main_view.class.php
index 763d32eb7dc..833cea10df3 100644
--- a/admin/xmldb/actions/main_view/main_view.class.php
+++ b/admin/tool/xmldb/actions/main_view/main_view.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -27,9 +27,10 @@
  * From here, files can be created, edited, saved and deleted, plus some
  * extra utilities like displaying docs, xml info and performing various consistency tests
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class main_view extends XMLDBAction {
 
@@ -44,22 +45,22 @@ class main_view extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'load' => 'xmldb',
-            'create' => 'xmldb',
-            'edit' => 'xmldb',
-            'save' => 'xmldb',
-            'revert' => 'xmldb',
-            'unload' => 'xmldb',
-            'delete' => 'xmldb',
-            'reservedwords' => 'xmldb',
-            'gotolastused' => 'xmldb',
-            'checkindexes' => 'xmldb',
-            'checkdefaults' => 'xmldb',
-            'checkforeignkeys' => 'xmldb',
-            'checkbigints' => 'xmldb',
-            'doc' => 'xmldb',
-            'viewxml' => 'xmldb',
-            'pendingchangescannotbesavedreload' => 'xmldb'
+            'load' => 'tool_xmldb',
+            'create' => 'tool_xmldb',
+            'edit' => 'tool_xmldb',
+            'save' => 'tool_xmldb',
+            'revert' => 'tool_xmldb',
+            'unload' => 'tool_xmldb',
+            'delete' => 'tool_xmldb',
+            'reservedwords' => 'tool_xmldb',
+            'gotolastused' => 'tool_xmldb',
+            'checkindexes' => 'tool_xmldb',
+            'checkdefaults' => 'tool_xmldb',
+            'checkforeignkeys' => 'tool_xmldb',
+            'checkbigints' => 'tool_xmldb',
+            'doc' => 'tool_xmldb',
+            'viewxml' => 'tool_xmldb',
+            'pendingchangescannotbesavedreload' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/move_updown_field/move_updown_field.class.php b/admin/tool/xmldb/actions/move_updown_field/move_updown_field.class.php
similarity index 70%
rename from admin/xmldb/actions/move_updown_field/move_updown_field.class.php
rename to admin/tool/xmldb/actions/move_updown_field/move_updown_field.class.php
index d7135539347..b024e0933cf 100644
--- a/admin/xmldb/actions/move_updown_field/move_updown_field.class.php
+++ b/admin/tool/xmldb/actions/move_updown_field/move_updown_field.class.php
@@ -1,31 +1,34 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will will move one field up/down
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
+/**
+ * This class will will move one field up/down
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class move_updown_field extends XMLDBAction {
 
     /**
diff --git a/admin/xmldb/actions/move_updown_index/move_updown_index.class.php b/admin/tool/xmldb/actions/move_updown_index/move_updown_index.class.php
similarity index 70%
rename from admin/xmldb/actions/move_updown_index/move_updown_index.class.php
rename to admin/tool/xmldb/actions/move_updown_index/move_updown_index.class.php
index 6cc16334385..a96cb6a8fc1 100644
--- a/admin/xmldb/actions/move_updown_index/move_updown_index.class.php
+++ b/admin/tool/xmldb/actions/move_updown_index/move_updown_index.class.php
@@ -1,31 +1,34 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will will move one index up/down
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
+/**
+ * This class will will move one index up/down
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class move_updown_index extends XMLDBAction {
 
     /**
diff --git a/admin/xmldb/actions/move_updown_key/move_updown_key.class.php b/admin/tool/xmldb/actions/move_updown_key/move_updown_key.class.php
similarity index 70%
rename from admin/xmldb/actions/move_updown_key/move_updown_key.class.php
rename to admin/tool/xmldb/actions/move_updown_key/move_updown_key.class.php
index 9b697ed984f..3b981ce2f9f 100644
--- a/admin/xmldb/actions/move_updown_key/move_updown_key.class.php
+++ b/admin/tool/xmldb/actions/move_updown_key/move_updown_key.class.php
@@ -1,31 +1,34 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will will move one key up/down
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
+/**
+ * This class will will move one key up/down
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class move_updown_key extends XMLDBAction {
 
     /**
diff --git a/admin/xmldb/actions/move_updown_table/move_updown_table.class.php b/admin/tool/xmldb/actions/move_updown_table/move_updown_table.class.php
similarity index 69%
rename from admin/xmldb/actions/move_updown_table/move_updown_table.class.php
rename to admin/tool/xmldb/actions/move_updown_table/move_updown_table.class.php
index f9b2043b677..fb70771a4fb 100644
--- a/admin/xmldb/actions/move_updown_table/move_updown_table.class.php
+++ b/admin/tool/xmldb/actions/move_updown_table/move_updown_table.class.php
@@ -1,31 +1,34 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
-
-/// This class will will move one table down
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
+/**
+ * This class will will move table up/down
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class move_updown_table extends XMLDBAction {
 
     /**
diff --git a/admin/xmldb/actions/new_field/new_field.class.php b/admin/tool/xmldb/actions/new_field/new_field.class.php
similarity index 88%
rename from admin/xmldb/actions/new_field/new_field.class.php
rename to admin/tool/xmldb/actions/new_field/new_field.class.php
index c1f2a611e1b..18fcb593099 100644
--- a/admin/xmldb/actions/new_field/new_field.class.php
+++ b/admin/tool/xmldb/actions/new_field/new_field.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will create a new default field to be edited
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class new_field extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/new_index/new_index.class.php b/admin/tool/xmldb/actions/new_index/new_index.class.php
similarity index 88%
rename from admin/xmldb/actions/new_index/new_index.class.php
rename to admin/tool/xmldb/actions/new_index/new_index.class.php
index 6cc956eac0a..839c5c3b541 100644
--- a/admin/xmldb/actions/new_index/new_index.class.php
+++ b/admin/tool/xmldb/actions/new_index/new_index.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will create a new default index to be edited
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class new_index extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/new_key/new_key.class.php b/admin/tool/xmldb/actions/new_key/new_key.class.php
similarity index 88%
rename from admin/xmldb/actions/new_key/new_key.class.php
rename to admin/tool/xmldb/actions/new_key/new_key.class.php
index 4c645d2b149..f2c165bfb0a 100644
--- a/admin/xmldb/actions/new_key/new_key.class.php
+++ b/admin/tool/xmldb/actions/new_key/new_key.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will create a new default key to be edited
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class new_key extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/new_table/new_table.class.php b/admin/tool/xmldb/actions/new_table/new_table.class.php
similarity index 90%
rename from admin/xmldb/actions/new_table/new_table.class.php
rename to admin/tool/xmldb/actions/new_table/new_table.class.php
index da5440ed103..c2572bad41c 100644
--- a/admin/xmldb/actions/new_table/new_table.class.php
+++ b/admin/tool/xmldb/actions/new_table/new_table.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will create a new default table to be edited
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class new_table extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php b/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php
similarity index 92%
rename from admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php
rename to admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php
index 68b14c1b932..7b9103b25ca 100644
--- a/admin/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php
+++ b/admin/tool/xmldb/actions/new_table_from_mysql/new_table_from_mysql.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will ask and retrofit all the information from one
  * mysql table present in the Moodle DB to one xmldb_table structure
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class new_table_from_mysql extends XMLDBAction {
 
@@ -41,10 +42,10 @@ class new_table_from_mysql extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'createtable' => 'xmldb',
-            'aftertable' => 'xmldb',
-            'create' => 'xmldb',
-            'back' => 'xmldb'
+            'createtable' => 'tool_xmldb',
+            'aftertable' => 'tool_xmldb',
+            'create' => 'tool_xmldb',
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/revert_changes/revert_changes.class.php b/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php
similarity index 90%
rename from admin/xmldb/actions/revert_changes/revert_changes.class.php
rename to admin/tool/xmldb/actions/revert_changes/revert_changes.class.php
index d775baf8071..09815b1a631 100644
--- a/admin/xmldb/actions/revert_changes/revert_changes.class.php
+++ b/admin/tool/xmldb/actions/revert_changes/revert_changes.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will revert changes (delete the editeddb)
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class revert_changes extends XMLDBAction {
 
@@ -40,7 +41,7 @@ class revert_changes extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'confirmrevertchanges' => 'xmldb',
+            'confirmrevertchanges' => 'tool_xmldb',
             'yes' => '',
             'no' => ''
         ));
diff --git a/admin/xmldb/actions/save_xml_file/save_xml_file.class.php b/admin/tool/xmldb/actions/save_xml_file/save_xml_file.class.php
similarity index 89%
rename from admin/xmldb/actions/save_xml_file/save_xml_file.class.php
rename to admin/tool/xmldb/actions/save_xml_file/save_xml_file.class.php
index 0e7523c8dc8..672e9bdc50e 100644
--- a/admin/xmldb/actions/save_xml_file/save_xml_file.class.php
+++ b/admin/tool/xmldb/actions/save_xml_file/save_xml_file.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -29,9 +29,10 @@
  * is going to continue (unload=false). Else (default) the
  * file is unloaded once saved.
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class save_xml_file extends XMLDBAction {
 
@@ -45,7 +46,7 @@ class save_xml_file extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'filenotwriteable' => 'xmldb'
+            'filenotwriteable' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/template/template.class.php b/admin/tool/xmldb/actions/template/template.class.php
similarity index 52%
rename from admin/xmldb/actions/template/template.class.php
rename to admin/tool/xmldb/actions/template/template.class.php
index 5d7a082f7e3..39ced27b8e4 100644
--- a/admin/xmldb/actions/template/template.class.php
+++ b/admin/tool/xmldb/actions/template/template.class.php
@@ -1,30 +1,32 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas        http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
-/// This class will
+/**
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class template extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/unload_xml_file/unload_xml_file.class.php b/admin/tool/xmldb/actions/unload_xml_file/unload_xml_file.class.php
similarity index 87%
rename from admin/xmldb/actions/unload_xml_file/unload_xml_file.class.php
rename to admin/tool/xmldb/actions/unload_xml_file/unload_xml_file.class.php
index 17085747817..5128dc25c23 100644
--- a/admin/xmldb/actions/unload_xml_file/unload_xml_file.class.php
+++ b/admin/tool/xmldb/actions/unload_xml_file/unload_xml_file.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will unload one loaded file completely
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class unload_xml_file extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/view_field_xml/view_field_xml.class.php b/admin/tool/xmldb/actions/view_field_xml/view_field_xml.class.php
similarity index 91%
rename from admin/xmldb/actions/view_field_xml/view_field_xml.class.php
rename to admin/tool/xmldb/actions/view_field_xml/view_field_xml.class.php
index 717cec40da0..c6f02860e72 100644
--- a/admin/xmldb/actions/view_field_xml/view_field_xml.class.php
+++ b/admin/tool/xmldb/actions/view_field_xml/view_field_xml.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will display the XML for one field being edited
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_field_xml extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/view_index_xml/view_index_xml.class.php b/admin/tool/xmldb/actions/view_index_xml/view_index_xml.class.php
similarity index 91%
rename from admin/xmldb/actions/view_index_xml/view_index_xml.class.php
rename to admin/tool/xmldb/actions/view_index_xml/view_index_xml.class.php
index 87e51819066..e802f9484e0 100644
--- a/admin/xmldb/actions/view_index_xml/view_index_xml.class.php
+++ b/admin/tool/xmldb/actions/view_index_xml/view_index_xml.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will display the XML for one index being edited
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_index_xml extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/view_key_xml/view_key_xml.class.php b/admin/tool/xmldb/actions/view_key_xml/view_key_xml.class.php
similarity index 91%
rename from admin/xmldb/actions/view_key_xml/view_key_xml.class.php
rename to admin/tool/xmldb/actions/view_key_xml/view_key_xml.class.php
index 00d3b6334f4..bc61e1191b3 100644
--- a/admin/xmldb/actions/view_key_xml/view_key_xml.class.php
+++ b/admin/tool/xmldb/actions/view_key_xml/view_key_xml.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will display the XML for one key being edited
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_key_xml extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/view_reserved_words/view_reserved_words.class.php b/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php
similarity index 87%
rename from admin/xmldb/actions/view_reserved_words/view_reserved_words.class.php
rename to admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php
index b5aaee14bbd..374af0fb6ad 100644
--- a/admin/xmldb/actions/view_reserved_words/view_reserved_words.class.php
+++ b/admin/tool/xmldb/actions/view_reserved_words/view_reserved_words.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,9 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
@@ -27,9 +27,10 @@
  * http://docs.moodle.org/en/Database_reserved_words
  * Also, it introspects te DB looking for such words and informing about
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_reserved_words extends XMLDBAction {
 
@@ -44,11 +45,11 @@ class view_reserved_words extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'listreservedwords' => 'xmldb',
-            'wrongreservedwords' => 'xmldb',
-            'table' => 'xmldb',
-            'field' => 'xmldb',
-            'back' => 'xmldb'
+            'listreservedwords' => 'tool_xmldb',
+            'wrongreservedwords' => 'tool_xmldb',
+            'table' => 'tool_xmldb',
+            'field' => 'tool_xmldb',
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/view_structure_php/view_structure_php.class.php b/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php
similarity index 95%
rename from admin/xmldb/actions/view_structure_php/view_structure_php.class.php
rename to admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php
index e7963ff02ed..86e689c066a 100644
--- a/admin/xmldb/actions/view_structure_php/view_structure_php.class.php
+++ b/admin/tool/xmldb/actions/view_structure_php/view_structure_php.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will show the PHP needed (upgrade block) to perform
  * the desired DDL action with the specified table
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_structure_php extends XMLDBAction {
 
@@ -42,10 +43,10 @@ class view_structure_php extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'selectaction' => 'xmldb',
-            'selecttable' => 'xmldb',
-            'view' => 'xmldb',
-            'back' => 'xmldb'
+            'selectaction' => 'tool_xmldb',
+            'selecttable' => 'tool_xmldb',
+            'view' => 'tool_xmldb',
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/view_structure_sql/view_structure_sql.class.php b/admin/tool/xmldb/actions/view_structure_sql/view_structure_sql.class.php
similarity index 87%
rename from admin/xmldb/actions/view_structure_sql/view_structure_sql.class.php
rename to admin/tool/xmldb/actions/view_structure_sql/view_structure_sql.class.php
index 136e0cb2c77..571640a56eb 100644
--- a/admin/xmldb/actions/view_structure_sql/view_structure_sql.class.php
+++ b/admin/tool/xmldb/actions/view_structure_sql/view_structure_sql.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will show the SQL generated for the selected RDBMS for
  * the entire XMLDB file
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_structure_sql extends XMLDBAction {
 
@@ -42,8 +43,8 @@ class view_structure_sql extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'selectdb' => 'xmldb',
-            'back' => 'xmldb'
+            'selectdb' => 'tool_xmldb',
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/view_structure_xml/view_structure_xml.class.php b/admin/tool/xmldb/actions/view_structure_xml/view_structure_xml.class.php
similarity index 89%
rename from admin/xmldb/actions/view_structure_xml/view_structure_xml.class.php
rename to admin/tool/xmldb/actions/view_structure_xml/view_structure_xml.class.php
index 7670b647473..5d809e7a1cc 100644
--- a/admin/xmldb/actions/view_structure_xml/view_structure_xml.class.php
+++ b/admin/tool/xmldb/actions/view_structure_xml/view_structure_xml.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will display the XML for one structure
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_structure_xml extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/view_table_php/view_table_php.class.php b/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php
similarity index 98%
rename from admin/xmldb/actions/view_table_php/view_table_php.class.php
rename to admin/tool/xmldb/actions/view_table_php/view_table_php.class.php
index 0e1c8395354..7be376c506f 100644
--- a/admin/xmldb/actions/view_table_php/view_table_php.class.php
+++ b/admin/tool/xmldb/actions/view_table_php/view_table_php.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will show the PHP needed (upgrade block) to perform
  * the desired DDL action with the specified field/key/index
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_table_php extends XMLDBAction {
 
@@ -42,16 +43,16 @@ class view_table_php extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'selectaction' => 'xmldb',
-            'selectfieldkeyindex' => 'xmldb',
-            'view' => 'xmldb',
-            'table' => 'xmldb',
-            'selectonecommand' => 'xmldb',
-            'selectonefieldkeyindex' => 'xmldb',
-            'mustselectonefield' => 'xmldb',
-            'mustselectonekey' => 'xmldb',
-            'mustselectoneindex' => 'xmldb',
-            'back' => 'xmldb'
+            'selectaction' => 'tool_xmldb',
+            'selectfieldkeyindex' => 'tool_xmldb',
+            'view' => 'tool_xmldb',
+            'table' => 'tool_xmldb',
+            'selectonecommand' => 'tool_xmldb',
+            'selectonefieldkeyindex' => 'tool_xmldb',
+            'mustselectonefield' => 'tool_xmldb',
+            'mustselectonekey' => 'tool_xmldb',
+            'mustselectoneindex' => 'tool_xmldb',
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/view_table_php/view_table_php.js b/admin/tool/xmldb/actions/view_table_php/view_table_php.js
similarity index 100%
rename from admin/xmldb/actions/view_table_php/view_table_php.js
rename to admin/tool/xmldb/actions/view_table_php/view_table_php.js
diff --git a/admin/xmldb/actions/view_table_sql/view_table_sql.class.php b/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
similarity index 86%
rename from admin/xmldb/actions/view_table_sql/view_table_sql.class.php
rename to admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
index fe6a3070f09..610459c5919 100644
--- a/admin/xmldb/actions/view_table_sql/view_table_sql.class.php
+++ b/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,18 +15,20 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
-/// This class will show the SQL generated for the selected RDBMS for
-/// one table
+ * This class will show the SQL generated for the selected RDBMS for
+ * one table
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_table_sql extends XMLDBAction {
 
@@ -42,8 +43,8 @@ class view_table_sql extends XMLDBAction {
 
     /// Get needed strings
         $this->loadStrings(array(
-            'selectdb' => 'xmldb',
-            'back' => 'xmldb'
+            'selectdb' => 'tool_xmldb',
+            'back' => 'tool_xmldb'
         ));
     }
 
diff --git a/admin/xmldb/actions/view_table_xml/view_table_xml.class.php b/admin/tool/xmldb/actions/view_table_xml/view_table_xml.class.php
similarity index 90%
rename from admin/xmldb/actions/view_table_xml/view_table_xml.class.php
rename to admin/tool/xmldb/actions/view_table_xml/view_table_xml.class.php
index 36e96060d21..ca96ab05516 100644
--- a/admin/xmldb/actions/view_table_xml/view_table_xml.class.php
+++ b/admin/tool/xmldb/actions/view_table_xml/view_table_xml.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will display the XML for one table being edited
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_table_xml extends XMLDBAction {
 
diff --git a/admin/xmldb/actions/view_xml/view_xml.class.php b/admin/tool/xmldb/actions/view_xml/view_xml.class.php
similarity index 86%
rename from admin/xmldb/actions/view_xml/view_xml.class.php
rename to admin/tool/xmldb/actions/view_xml/view_xml.class.php
index 1361cf6e051..99263e964d8 100644
--- a/admin/xmldb/actions/view_xml/view_xml.class.php
+++ b/admin/tool/xmldb/actions/view_xml/view_xml.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,17 +15,19 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
  * This class will display one XML file
  *
- * @package   xmldb-editor
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class view_xml extends XMLDBAction {
 
diff --git a/admin/xmldb/index.php b/admin/tool/xmldb/index.php
similarity index 63%
rename from admin/xmldb/index.php
rename to admin/tool/xmldb/index.php
index 70c3f6da30d..094b5d922e2 100644
--- a/admin/xmldb/index.php
+++ b/admin/tool/xmldb/index.php
@@ -1,33 +1,31 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas     http://dougiamas.com  //
-//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
+/**
+ * This is the main script for the complete XMLDB interface. From here
+ * all the actions supported will be launched.
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  (C) 1999 onwards Martin Dougiamas http://dougiamas.com,
+ *             (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
-/// This is the main script for the complete XMLDB interface. From here
-/// all the actions supported will be launched.
-
-    require_once('../../config.php');
+    require('../../../config.php');
     require_once($CFG->libdir.'/adminlib.php');
     require_once($CFG->libdir.'/ddllib.php');
 /// Add required XMLDB action classes
@@ -35,7 +33,7 @@
     require_once('actions/XMLDBCheckAction.class.php');
 
 
-    admin_externalpage_setup('xmldbeditor');
+    admin_externalpage_setup('toolxmld');
 
 /// Add other used libraries
     require_once($CFG->libdir . '/xmlize.php');
@@ -60,7 +58,7 @@
     $action = optional_param ('action', 'main_view', PARAM_ALPHAEXT);
 
 /// Get the action path and invoke it
-    $actionsroot = "$CFG->dirroot/$CFG->admin/xmldb/actions";
+    $actionsroot = "$CFG->dirroot/$CFG->admin/tool/xmldb/actions";
     $actionclass = $action . '.class.php';
     $actionpath = "$actionsroot/$action/$actionclass";
 
@@ -82,13 +80,13 @@
                         $postaction = optional_param('postaction', '', PARAM_ALPHAEXT);
                     /// If the js exists, load it
                         if ($action) {
-                            $script = $CFG->admin . '/xmldb/actions/' . $action . '/' . $action . '.js';
+                            $script = $CFG->admin . '/tool/xmldb/actions/' . $action . '/' . $action . '.js';
                             $file = $CFG->dirroot . '/' . $script;
                             if (file_exists($file) && is_readable($file)) {
                                 $PAGE->requires->js('/'.$script);
                             } else if ($postaction) {
                             /// Try to load the postaction javascript if exists
-                                $script = $CFG->admin . '/xmldb/actions/' . $postaction . '/' . $postaction . '.js';
+                                $script = $CFG->admin . '/tool/xmldb/actions/' . $postaction . '/' . $postaction . '.js';
                                 $file = $CFG->dirroot . '/' . $script;
                                 if (file_exists($file) && is_readable($file)) {
                                     $PAGE->requires->js('/'.$script);
@@ -115,7 +113,7 @@
             $a = new stdClass();
             $a->action = $action;
             $a->actionclass = $actionclass;
-            print_error('cannotinstantiateclass', 'xmldb', '', $a);
+            print_error('cannotinstantiateclass', 'tool_xmldb', '', $a);
         }
     } else {
         print_error('invalidaction');
diff --git a/lang/en/xmldb.php b/admin/tool/xmldb/lang/en/tool_xmldb.php
similarity index 97%
rename from lang/en/xmldb.php
rename to admin/tool/xmldb/lang/en/tool_xmldb.php
index 936e94866a2..d95ca7c19a2 100644
--- a/lang/en/xmldb.php
+++ b/admin/tool/xmldb/lang/en/tool_xmldb.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,11 +15,12 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'xmldb', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'tool_xmldb', language 'en', branch 'MOODLE_22_STABLE'
  *
- * @package   xmldb
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 $string['actual'] = 'Actual';
@@ -135,6 +135,7 @@ $string['numberincorrectlength'] = 'Incorrect length for number field';
 $string['pendingchanges'] = 'Note: You have performed changes to this file. They can be saved at any moment.';
 $string['pendingchangescannotbesaved'] = 'There are changes in this file but they cannot be saved! Please verify that both the directory and the "install.xml" within it have write permissions for the web server.';
 $string['pendingchangescannotbesavedreload'] = 'There are changes in this file but they cannot be saved! Please verify that both the directory and the "install.xml" within it have write permissions for the web server. Then reload this page and you should be able to save those changes.';
+$string['pluginname'] = 'XMLDB editor';
 $string['reserved'] = 'Reserved';
 $string['reservedwords'] = 'Reserved words';
 $string['revert'] = 'Revert';
diff --git a/admin/tool/xmldb/settings.php b/admin/tool/xmldb/settings.php
new file mode 100644
index 00000000000..e68771e5061
--- /dev/null
+++ b/admin/tool/xmldb/settings.php
@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Link to xmldb editor
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die;
+
+if ($hassiteconfig) {
+    $ADMIN->add('development', new admin_externalpage('toolxmld', get_string('pluginname', 'tool_xmldb'), "$CFG->wwwroot/$CFG->admin/tool/xmldb/"));
+}
diff --git a/admin/tool/xmldb/version.php b/admin/tool/xmldb/version.php
new file mode 100644
index 00000000000..ebd038255e6
--- /dev/null
+++ b/admin/tool/xmldb/version.php
@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Plugin version info
+ *
+ * @package    tool
+ * @subpackage xmldb
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+defined('MOODLE_INTERNAL') || die;
+
+$plugin->version   = 2011091700; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2011091600; // Requires this Moodle version
+$plugin->component = 'tool_xmldb'; // Full name of the plugin (used for diagnostics)
+
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index fd9c8d6437b..4615a99a2ed 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1793,7 +1793,6 @@ $string['writingmoduleinfo'] = 'Writing modules info';
 $string['writingscalesinfo'] = 'Writing scales info';
 $string['writinguserinfo'] = 'Writing users info';
 $string['wrongpassword'] = 'Incorrect password for this username';
-$string['xmldbeditor'] = 'XMLDB editor';
 $string['yahooid'] = 'Yahoo ID';
 $string['year'] = 'year';
 $string['years'] = 'years';
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index c68929754cd..c9c026bc75f 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -7252,7 +7252,6 @@ function get_core_subsystems() {
             'user'        => 'user',
             'userkey'     => NULL,
             'webservice'  => 'webservice',
-            'xmldb'       => NULL,
         );
     }
 
diff --git a/lib/pluginlib.php b/lib/pluginlib.php
index af63bf08497..bdebc0ae8ba 100644
--- a/lib/pluginlib.php
+++ b/lib/pluginlib.php
@@ -368,7 +368,7 @@ class plugin_manager {
 
             'tool' => array(
                 'bloglevelupgrade', 'capability', 'dbtransfer', 'generator', 'health',
-                'innodb', 'langimport', 'profiling', 'unittest', 'unsuproles'
+                'innodb', 'langimport', 'profiling', 'unittest', 'unsuproles', 'xmldb'
             ),
 
             'webservice' => array(