diff --git a/include/limesurvey/classes/adodb5/.idea/adodb.iml b/include/limesurvey/classes/adodb/.idea/adodb.iml
similarity index 100%
rename from include/limesurvey/classes/adodb5/.idea/adodb.iml
rename to include/limesurvey/classes/adodb/.idea/adodb.iml
diff --git a/include/limesurvey/classes/adodb5/.idea/copyright/profiles_settings.xml b/include/limesurvey/classes/adodb/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/.idea/copyright/profiles_settings.xml
rename to include/limesurvey/classes/adodb/.idea/copyright/profiles_settings.xml
diff --git a/include/limesurvey/classes/adodb5/.idea/dictionaries/dregad.xml b/include/limesurvey/classes/adodb/.idea/dictionaries/dregad.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/.idea/dictionaries/dregad.xml
rename to include/limesurvey/classes/adodb/.idea/dictionaries/dregad.xml
diff --git a/include/limesurvey/classes/adodb5/.idea/inspectionProfiles/Project_Default.xml b/include/limesurvey/classes/adodb/.idea/inspectionProfiles/Project_Default.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/.idea/inspectionProfiles/Project_Default.xml
rename to include/limesurvey/classes/adodb/.idea/inspectionProfiles/Project_Default.xml
diff --git a/include/limesurvey/classes/adodb5/.idea/inspectionProfiles/profiles_settings.xml b/include/limesurvey/classes/adodb/.idea/inspectionProfiles/profiles_settings.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/.idea/inspectionProfiles/profiles_settings.xml
rename to include/limesurvey/classes/adodb/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/include/limesurvey/classes/adodb5/.idea/modules.xml b/include/limesurvey/classes/adodb/.idea/modules.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/.idea/modules.xml
rename to include/limesurvey/classes/adodb/.idea/modules.xml
diff --git a/include/limesurvey/classes/adodb5/.idea/vcs.xml b/include/limesurvey/classes/adodb/.idea/vcs.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/.idea/vcs.xml
rename to include/limesurvey/classes/adodb/.idea/vcs.xml
diff --git a/include/limesurvey/classes/adodb5/.idea/workspace.xml b/include/limesurvey/classes/adodb/.idea/workspace.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/.idea/workspace.xml
rename to include/limesurvey/classes/adodb/.idea/workspace.xml
diff --git a/include/limesurvey/classes/adodb5/.mailmap b/include/limesurvey/classes/adodb/.mailmap
similarity index 100%
rename from include/limesurvey/classes/adodb5/.mailmap
rename to include/limesurvey/classes/adodb/.mailmap
diff --git a/include/limesurvey/classes/adodb5/LICENSE.md b/include/limesurvey/classes/adodb/LICENSE.md
similarity index 100%
rename from include/limesurvey/classes/adodb5/LICENSE.md
rename to include/limesurvey/classes/adodb/LICENSE.md
diff --git a/include/limesurvey/classes/adodb5/README.md b/include/limesurvey/classes/adodb/README.md
similarity index 100%
rename from include/limesurvey/classes/adodb5/README.md
rename to include/limesurvey/classes/adodb/README.md
diff --git a/include/limesurvey/classes/adodb5/adodb-active-record.inc.php b/include/limesurvey/classes/adodb/adodb-active-record.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-active-record.inc.php
rename to include/limesurvey/classes/adodb/adodb-active-record.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-active-recordx.inc.php b/include/limesurvey/classes/adodb/adodb-active-recordx.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-active-recordx.inc.php
rename to include/limesurvey/classes/adodb/adodb-active-recordx.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-csvlib.inc.php b/include/limesurvey/classes/adodb/adodb-csvlib.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-csvlib.inc.php
rename to include/limesurvey/classes/adodb/adodb-csvlib.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-datadict.inc.php b/include/limesurvey/classes/adodb/adodb-datadict.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-datadict.inc.php
rename to include/limesurvey/classes/adodb/adodb-datadict.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-error.inc.php b/include/limesurvey/classes/adodb/adodb-error.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-error.inc.php
rename to include/limesurvey/classes/adodb/adodb-error.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-errorhandler.inc.php b/include/limesurvey/classes/adodb/adodb-errorhandler.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-errorhandler.inc.php
rename to include/limesurvey/classes/adodb/adodb-errorhandler.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-errorpear.inc.php b/include/limesurvey/classes/adodb/adodb-errorpear.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-errorpear.inc.php
rename to include/limesurvey/classes/adodb/adodb-errorpear.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-exceptions.inc.php b/include/limesurvey/classes/adodb/adodb-exceptions.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-exceptions.inc.php
rename to include/limesurvey/classes/adodb/adodb-exceptions.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-iterator.inc.php b/include/limesurvey/classes/adodb/adodb-iterator.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-iterator.inc.php
rename to include/limesurvey/classes/adodb/adodb-iterator.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-lib.inc.php b/include/limesurvey/classes/adodb/adodb-lib.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-lib.inc.php
rename to include/limesurvey/classes/adodb/adodb-lib.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-memcache.lib.inc.php b/include/limesurvey/classes/adodb/adodb-memcache.lib.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-memcache.lib.inc.php
rename to include/limesurvey/classes/adodb/adodb-memcache.lib.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-pager.inc.php b/include/limesurvey/classes/adodb/adodb-pager.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-pager.inc.php
rename to include/limesurvey/classes/adodb/adodb-pager.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-pear.inc.php b/include/limesurvey/classes/adodb/adodb-pear.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-pear.inc.php
rename to include/limesurvey/classes/adodb/adodb-pear.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-perf.inc.php b/include/limesurvey/classes/adodb/adodb-perf.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-perf.inc.php
rename to include/limesurvey/classes/adodb/adodb-perf.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-php4.inc.php b/include/limesurvey/classes/adodb/adodb-php4.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-php4.inc.php
rename to include/limesurvey/classes/adodb/adodb-php4.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-time.inc.php b/include/limesurvey/classes/adodb/adodb-time.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-time.inc.php
rename to include/limesurvey/classes/adodb/adodb-time.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-xmlschema.inc.php b/include/limesurvey/classes/adodb/adodb-xmlschema.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-xmlschema.inc.php
rename to include/limesurvey/classes/adodb/adodb-xmlschema.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb-xmlschema03.inc.php b/include/limesurvey/classes/adodb/adodb-xmlschema03.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb-xmlschema03.inc.php
rename to include/limesurvey/classes/adodb/adodb-xmlschema03.inc.php
diff --git a/include/limesurvey/classes/adodb5/adodb.inc.php b/include/limesurvey/classes/adodb/adodb.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/adodb.inc.php
rename to include/limesurvey/classes/adodb/adodb.inc.php
diff --git a/include/limesurvey/classes/adodb5/composer.json b/include/limesurvey/classes/adodb/composer.json
similarity index 100%
rename from include/limesurvey/classes/adodb5/composer.json
rename to include/limesurvey/classes/adodb/composer.json
diff --git a/include/limesurvey/classes/adodb5/contrib/toxmlrpc.inc.php b/include/limesurvey/classes/adodb/contrib/toxmlrpc.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/contrib/toxmlrpc.inc.php
rename to include/limesurvey/classes/adodb/contrib/toxmlrpc.inc.php
diff --git a/include/limesurvey/classes/adodb5/cute_icons_for_site/adodb.gif b/include/limesurvey/classes/adodb/cute_icons_for_site/adodb.gif
similarity index 100%
rename from include/limesurvey/classes/adodb5/cute_icons_for_site/adodb.gif
rename to include/limesurvey/classes/adodb/cute_icons_for_site/adodb.gif
diff --git a/include/limesurvey/classes/adodb5/cute_icons_for_site/adodb2.gif b/include/limesurvey/classes/adodb/cute_icons_for_site/adodb2.gif
similarity index 100%
rename from include/limesurvey/classes/adodb5/cute_icons_for_site/adodb2.gif
rename to include/limesurvey/classes/adodb/cute_icons_for_site/adodb2.gif
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-access.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-access.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-access.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-access.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-db2.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-db2.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-db2.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-db2.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-firebird.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-firebird.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-firebird.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-firebird.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-generic.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-generic.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-generic.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-generic.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-ibase.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-ibase.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-ibase.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-ibase.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-informix.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-informix.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-informix.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-informix.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-mssql.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-mssql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-mssql.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-mssql.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-mssqlnative.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-mssqlnative.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-mssqlnative.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-mssqlnative.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-mysql.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-mysql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-mysql.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-mysql.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-oci8.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-oci8.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-oci8.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-oci8.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-postgres.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-postgres.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-postgres.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-postgres.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-sapdb.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-sapdb.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-sapdb.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-sapdb.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-sqlite.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-sqlite.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-sqlite.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-sqlite.inc.php
diff --git a/include/limesurvey/classes/adodb5/datadict/datadict-sybase.inc.php b/include/limesurvey/classes/adodb/datadict/datadict-sybase.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/datadict/datadict-sybase.inc.php
rename to include/limesurvey/classes/adodb/datadict/datadict-sybase.inc.php
diff --git a/include/limesurvey/classes/adodb5/docs/README.md b/include/limesurvey/classes/adodb/docs/README.md
similarity index 100%
rename from include/limesurvey/classes/adodb5/docs/README.md
rename to include/limesurvey/classes/adodb/docs/README.md
diff --git a/include/limesurvey/classes/adodb5/docs/adodb.gif b/include/limesurvey/classes/adodb/docs/adodb.gif
similarity index 100%
rename from include/limesurvey/classes/adodb5/docs/adodb.gif
rename to include/limesurvey/classes/adodb/docs/adodb.gif
diff --git a/include/limesurvey/classes/adodb5/docs/adodb2.gif b/include/limesurvey/classes/adodb/docs/adodb2.gif
similarity index 100%
rename from include/limesurvey/classes/adodb5/docs/adodb2.gif
rename to include/limesurvey/classes/adodb/docs/adodb2.gif
diff --git a/include/limesurvey/classes/adodb5/docs/changelog.md b/include/limesurvey/classes/adodb/docs/changelog.md
similarity index 100%
rename from include/limesurvey/classes/adodb5/docs/changelog.md
rename to include/limesurvey/classes/adodb/docs/changelog.md
diff --git a/include/limesurvey/classes/adodb5/docs/changelog_v2.x.md b/include/limesurvey/classes/adodb/docs/changelog_v2.x.md
similarity index 100%
rename from include/limesurvey/classes/adodb5/docs/changelog_v2.x.md
rename to include/limesurvey/classes/adodb/docs/changelog_v2.x.md
diff --git a/include/limesurvey/classes/adodb5/docs/changelog_v3.x.md b/include/limesurvey/classes/adodb/docs/changelog_v3.x.md
similarity index 100%
rename from include/limesurvey/classes/adodb5/docs/changelog_v3.x.md
rename to include/limesurvey/classes/adodb/docs/changelog_v3.x.md
diff --git a/include/limesurvey/classes/adodb5/docs/changelog_v4+5.md b/include/limesurvey/classes/adodb/docs/changelog_v4+5.md
similarity index 100%
rename from include/limesurvey/classes/adodb5/docs/changelog_v4+5.md
rename to include/limesurvey/classes/adodb/docs/changelog_v4+5.md
diff --git a/include/limesurvey/classes/adodb5/docs/changelog_v4.x.md b/include/limesurvey/classes/adodb/docs/changelog_v4.x.md
similarity index 100%
rename from include/limesurvey/classes/adodb5/docs/changelog_v4.x.md
rename to include/limesurvey/classes/adodb/docs/changelog_v4.x.md
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-access.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-access.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-access.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-access.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-ado.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-ado.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-ado.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-ado.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-ado5.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-ado5.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-ado5.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-ado5.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-ado_access.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-ado_access.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-ado_access.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-ado_access.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-ado_mssql.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-ado_mssql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-ado_mssql.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-ado_mssql.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-ads.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-ads.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-ads.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-ads.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-borland_ibase.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-borland_ibase.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-borland_ibase.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-borland_ibase.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-csv.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-csv.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-csv.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-csv.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-db2.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-db2.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-db2.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-db2.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-db2oci.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-db2oci.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-db2oci.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-db2oci.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-db2ora.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-db2ora.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-db2ora.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-db2ora.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-fbsql.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-fbsql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-fbsql.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-fbsql.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-firebird.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-firebird.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-firebird.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-firebird.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-ibase.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-ibase.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-ibase.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-ibase.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-informix.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-informix.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-informix.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-informix.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-informix72.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-informix72.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-informix72.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-informix72.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-ldap.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-ldap.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-ldap.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-ldap.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-mssql.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-mssql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-mssql.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-mssql.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-mssql_n.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-mssql_n.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-mssql_n.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-mssql_n.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-mssqlnative.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-mssqlnative.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-mssqlnative.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-mssqlnative.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-mssqlpo.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-mssqlpo.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-mssqlpo.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-mssqlpo.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-mysql.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-mysql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-mysql.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-mysql.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-mysqli.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-mysqli.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-mysqli.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-mysqli.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-mysqlpo.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-mysqlpo.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-mysqlpo.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-mysqlpo.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-mysqlt.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-mysqlt.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-mysqlt.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-mysqlt.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-netezza.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-netezza.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-netezza.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-netezza.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-oci8.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-oci8.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-oci8.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-oci8.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-oci805.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-oci805.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-oci805.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-oci805.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-oci8po.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-oci8po.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-oci8po.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-oci8po.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-oci8quercus.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-oci8quercus.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-oci8quercus.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-oci8quercus.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-odbc.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-odbc.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-odbc.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-odbc.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-odbc_db2.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-odbc_db2.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-odbc_db2.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-odbc_db2.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-odbc_mssql.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-odbc_mssql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-odbc_mssql.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-odbc_mssql.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-odbc_oracle.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-odbc_oracle.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-odbc_oracle.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-odbc_oracle.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-odbtp.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-odbtp.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-odbtp.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-odbtp.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-odbtp_unicode.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-odbtp_unicode.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-odbtp_unicode.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-odbtp_unicode.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-oracle.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-oracle.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-oracle.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-oracle.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-pdo.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-pdo.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-pdo.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-pdo.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-pdo_mssql.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-pdo_mssql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-pdo_mssql.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-pdo_mssql.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-pdo_mysql.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-pdo_mysql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-pdo_mysql.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-pdo_mysql.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-pdo_oci.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-pdo_oci.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-pdo_oci.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-pdo_oci.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-pdo_pgsql.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-pdo_pgsql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-pdo_pgsql.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-pdo_pgsql.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-pdo_sqlite.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-pdo_sqlite.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-pdo_sqlite.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-pdo_sqlite.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-pdo_sqlsrv.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-pdo_sqlsrv.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-pdo_sqlsrv.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-pdo_sqlsrv.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-postgres.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-postgres.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-postgres.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-postgres.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-postgres64.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-postgres64.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-postgres64.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-postgres64.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-postgres7.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-postgres7.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-postgres7.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-postgres7.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-postgres8.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-postgres8.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-postgres8.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-postgres8.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-postgres9.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-postgres9.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-postgres9.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-postgres9.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-proxy.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-proxy.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-proxy.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-proxy.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-sapdb.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-sapdb.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-sapdb.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-sapdb.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-sqlanywhere.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-sqlanywhere.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-sqlanywhere.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-sqlanywhere.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-sqlite.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-sqlite.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-sqlite.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-sqlite.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-sqlite3.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-sqlite3.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-sqlite3.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-sqlite3.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-sqlitepo.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-sqlitepo.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-sqlitepo.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-sqlitepo.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-sybase.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-sybase.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-sybase.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-sybase.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-sybase_ase.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-sybase_ase.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-sybase_ase.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-sybase_ase.inc.php
diff --git a/include/limesurvey/classes/adodb5/drivers/adodb-vfp.inc.php b/include/limesurvey/classes/adodb/drivers/adodb-vfp.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/drivers/adodb-vfp.inc.php
rename to include/limesurvey/classes/adodb/drivers/adodb-vfp.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-ar.inc.php b/include/limesurvey/classes/adodb/lang/adodb-ar.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-ar.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-ar.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-bg.inc.php b/include/limesurvey/classes/adodb/lang/adodb-bg.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-bg.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-bg.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-ca.inc.php b/include/limesurvey/classes/adodb/lang/adodb-ca.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-ca.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-ca.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-cn.inc.php b/include/limesurvey/classes/adodb/lang/adodb-cn.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-cn.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-cn.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-cz.inc.php b/include/limesurvey/classes/adodb/lang/adodb-cz.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-cz.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-cz.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-da.inc.php b/include/limesurvey/classes/adodb/lang/adodb-da.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-da.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-da.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-de.inc.php b/include/limesurvey/classes/adodb/lang/adodb-de.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-de.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-de.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-en.inc.php b/include/limesurvey/classes/adodb/lang/adodb-en.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-en.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-en.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-eo.inc.php b/include/limesurvey/classes/adodb/lang/adodb-eo.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-eo.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-eo.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-es.inc.php b/include/limesurvey/classes/adodb/lang/adodb-es.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-es.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-es.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-fa.inc.php b/include/limesurvey/classes/adodb/lang/adodb-fa.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-fa.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-fa.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-fr.inc.php b/include/limesurvey/classes/adodb/lang/adodb-fr.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-fr.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-fr.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-hu.inc.php b/include/limesurvey/classes/adodb/lang/adodb-hu.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-hu.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-hu.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-it.inc.php b/include/limesurvey/classes/adodb/lang/adodb-it.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-it.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-it.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-nl.inc.php b/include/limesurvey/classes/adodb/lang/adodb-nl.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-nl.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-nl.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-pl.inc.php b/include/limesurvey/classes/adodb/lang/adodb-pl.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-pl.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-pl.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-pt-br.inc.php b/include/limesurvey/classes/adodb/lang/adodb-pt-br.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-pt-br.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-pt-br.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-ro.inc.php b/include/limesurvey/classes/adodb/lang/adodb-ro.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-ro.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-ro.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-ru.inc.php b/include/limesurvey/classes/adodb/lang/adodb-ru.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-ru.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-ru.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-sv.inc.php b/include/limesurvey/classes/adodb/lang/adodb-sv.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-sv.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-sv.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-th.inc.php b/include/limesurvey/classes/adodb/lang/adodb-th.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-th.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-th.inc.php
diff --git a/include/limesurvey/classes/adodb5/lang/adodb-uk.inc.php b/include/limesurvey/classes/adodb/lang/adodb-uk.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/lang/adodb-uk.inc.php
rename to include/limesurvey/classes/adodb/lang/adodb-uk.inc.php
diff --git a/include/limesurvey/classes/adodb5/nbproject/private/config.properties b/include/limesurvey/classes/adodb/nbproject/private/config.properties
similarity index 100%
rename from include/limesurvey/classes/adodb5/nbproject/private/config.properties
rename to include/limesurvey/classes/adodb/nbproject/private/config.properties
diff --git a/include/limesurvey/classes/adodb5/nbproject/private/private.properties b/include/limesurvey/classes/adodb/nbproject/private/private.properties
similarity index 100%
rename from include/limesurvey/classes/adodb5/nbproject/private/private.properties
rename to include/limesurvey/classes/adodb/nbproject/private/private.properties
diff --git a/include/limesurvey/classes/adodb5/nbproject/private/private.xml b/include/limesurvey/classes/adodb/nbproject/private/private.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/nbproject/private/private.xml
rename to include/limesurvey/classes/adodb/nbproject/private/private.xml
diff --git a/include/limesurvey/classes/adodb5/nbproject/project.properties b/include/limesurvey/classes/adodb/nbproject/project.properties
similarity index 100%
rename from include/limesurvey/classes/adodb5/nbproject/project.properties
rename to include/limesurvey/classes/adodb/nbproject/project.properties
diff --git a/include/limesurvey/classes/adodb5/nbproject/project.xml b/include/limesurvey/classes/adodb/nbproject/project.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/nbproject/project.xml
rename to include/limesurvey/classes/adodb/nbproject/project.xml
diff --git a/include/limesurvey/classes/adodb5/pear/Auth/Container/ADOdb.php b/include/limesurvey/classes/adodb/pear/Auth/Container/ADOdb.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/pear/Auth/Container/ADOdb.php
rename to include/limesurvey/classes/adodb/pear/Auth/Container/ADOdb.php
diff --git a/include/limesurvey/classes/adodb5/pear/auth_adodb_example.php b/include/limesurvey/classes/adodb/pear/auth_adodb_example.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/pear/auth_adodb_example.php
rename to include/limesurvey/classes/adodb/pear/auth_adodb_example.php
diff --git a/include/limesurvey/classes/adodb5/pear/readme.Auth.txt b/include/limesurvey/classes/adodb/pear/readme.Auth.txt
similarity index 100%
rename from include/limesurvey/classes/adodb5/pear/readme.Auth.txt
rename to include/limesurvey/classes/adodb/pear/readme.Auth.txt
diff --git a/include/limesurvey/classes/adodb5/perf/perf-db2.inc.php b/include/limesurvey/classes/adodb/perf/perf-db2.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/perf/perf-db2.inc.php
rename to include/limesurvey/classes/adodb/perf/perf-db2.inc.php
diff --git a/include/limesurvey/classes/adodb5/perf/perf-informix.inc.php b/include/limesurvey/classes/adodb/perf/perf-informix.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/perf/perf-informix.inc.php
rename to include/limesurvey/classes/adodb/perf/perf-informix.inc.php
diff --git a/include/limesurvey/classes/adodb5/perf/perf-mssql.inc.php b/include/limesurvey/classes/adodb/perf/perf-mssql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/perf/perf-mssql.inc.php
rename to include/limesurvey/classes/adodb/perf/perf-mssql.inc.php
diff --git a/include/limesurvey/classes/adodb5/perf/perf-mssqlnative.inc.php b/include/limesurvey/classes/adodb/perf/perf-mssqlnative.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/perf/perf-mssqlnative.inc.php
rename to include/limesurvey/classes/adodb/perf/perf-mssqlnative.inc.php
diff --git a/include/limesurvey/classes/adodb5/perf/perf-mysql.inc.php b/include/limesurvey/classes/adodb/perf/perf-mysql.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/perf/perf-mysql.inc.php
rename to include/limesurvey/classes/adodb/perf/perf-mysql.inc.php
diff --git a/include/limesurvey/classes/adodb5/perf/perf-oci8.inc.php b/include/limesurvey/classes/adodb/perf/perf-oci8.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/perf/perf-oci8.inc.php
rename to include/limesurvey/classes/adodb/perf/perf-oci8.inc.php
diff --git a/include/limesurvey/classes/adodb5/perf/perf-postgres.inc.php b/include/limesurvey/classes/adodb/perf/perf-postgres.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/perf/perf-postgres.inc.php
rename to include/limesurvey/classes/adodb/perf/perf-postgres.inc.php
diff --git a/include/limesurvey/classes/adodb5/pivottable.inc.php b/include/limesurvey/classes/adodb/pivottable.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/pivottable.inc.php
rename to include/limesurvey/classes/adodb/pivottable.inc.php
diff --git a/include/limesurvey/classes/adodb5/rsfilter.inc.php b/include/limesurvey/classes/adodb/rsfilter.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/rsfilter.inc.php
rename to include/limesurvey/classes/adodb/rsfilter.inc.php
diff --git a/include/limesurvey/classes/adodb5/server.php b/include/limesurvey/classes/adodb/server.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/server.php
rename to include/limesurvey/classes/adodb/server.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-compress-bzip2.php b/include/limesurvey/classes/adodb/session/adodb-compress-bzip2.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-compress-bzip2.php
rename to include/limesurvey/classes/adodb/session/adodb-compress-bzip2.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-compress-gzip.php b/include/limesurvey/classes/adodb/session/adodb-compress-gzip.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-compress-gzip.php
rename to include/limesurvey/classes/adodb/session/adodb-compress-gzip.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-cryptsession.php b/include/limesurvey/classes/adodb/session/adodb-cryptsession.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-cryptsession.php
rename to include/limesurvey/classes/adodb/session/adodb-cryptsession.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-cryptsession2.php b/include/limesurvey/classes/adodb/session/adodb-cryptsession2.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-cryptsession2.php
rename to include/limesurvey/classes/adodb/session/adodb-cryptsession2.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-encrypt-mcrypt.php b/include/limesurvey/classes/adodb/session/adodb-encrypt-mcrypt.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-encrypt-mcrypt.php
rename to include/limesurvey/classes/adodb/session/adodb-encrypt-mcrypt.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-encrypt-md5.php b/include/limesurvey/classes/adodb/session/adodb-encrypt-md5.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-encrypt-md5.php
rename to include/limesurvey/classes/adodb/session/adodb-encrypt-md5.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-encrypt-secret.php b/include/limesurvey/classes/adodb/session/adodb-encrypt-secret.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-encrypt-secret.php
rename to include/limesurvey/classes/adodb/session/adodb-encrypt-secret.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-encrypt-sha1.php b/include/limesurvey/classes/adodb/session/adodb-encrypt-sha1.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-encrypt-sha1.php
rename to include/limesurvey/classes/adodb/session/adodb-encrypt-sha1.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-sess.txt b/include/limesurvey/classes/adodb/session/adodb-sess.txt
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-sess.txt
rename to include/limesurvey/classes/adodb/session/adodb-sess.txt
diff --git a/include/limesurvey/classes/adodb5/session/adodb-session-clob.php b/include/limesurvey/classes/adodb/session/adodb-session-clob.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-session-clob.php
rename to include/limesurvey/classes/adodb/session/adodb-session-clob.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-session-clob2.php b/include/limesurvey/classes/adodb/session/adodb-session-clob2.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-session-clob2.php
rename to include/limesurvey/classes/adodb/session/adodb-session-clob2.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-session.php b/include/limesurvey/classes/adodb/session/adodb-session.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-session.php
rename to include/limesurvey/classes/adodb/session/adodb-session.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-session2.php b/include/limesurvey/classes/adodb/session/adodb-session2.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-session2.php
rename to include/limesurvey/classes/adodb/session/adodb-session2.php
diff --git a/include/limesurvey/classes/adodb5/session/adodb-sessions.mysql.sql b/include/limesurvey/classes/adodb/session/adodb-sessions.mysql.sql
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-sessions.mysql.sql
rename to include/limesurvey/classes/adodb/session/adodb-sessions.mysql.sql
diff --git a/include/limesurvey/classes/adodb5/session/adodb-sessions.oracle.clob.sql b/include/limesurvey/classes/adodb/session/adodb-sessions.oracle.clob.sql
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-sessions.oracle.clob.sql
rename to include/limesurvey/classes/adodb/session/adodb-sessions.oracle.clob.sql
diff --git a/include/limesurvey/classes/adodb5/session/adodb-sessions.oracle.sql b/include/limesurvey/classes/adodb/session/adodb-sessions.oracle.sql
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/adodb-sessions.oracle.sql
rename to include/limesurvey/classes/adodb/session/adodb-sessions.oracle.sql
diff --git a/include/limesurvey/classes/adodb5/session/crypt.inc.php b/include/limesurvey/classes/adodb/session/crypt.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/crypt.inc.php
rename to include/limesurvey/classes/adodb/session/crypt.inc.php
diff --git a/include/limesurvey/classes/adodb5/session/old/adodb-cryptsession.php b/include/limesurvey/classes/adodb/session/old/adodb-cryptsession.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/old/adodb-cryptsession.php
rename to include/limesurvey/classes/adodb/session/old/adodb-cryptsession.php
diff --git a/include/limesurvey/classes/adodb5/session/old/adodb-session-clob.php b/include/limesurvey/classes/adodb/session/old/adodb-session-clob.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/old/adodb-session-clob.php
rename to include/limesurvey/classes/adodb/session/old/adodb-session-clob.php
diff --git a/include/limesurvey/classes/adodb5/session/old/adodb-session.php b/include/limesurvey/classes/adodb/session/old/adodb-session.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/old/adodb-session.php
rename to include/limesurvey/classes/adodb/session/old/adodb-session.php
diff --git a/include/limesurvey/classes/adodb5/session/old/crypt.inc.php b/include/limesurvey/classes/adodb/session/old/crypt.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/old/crypt.inc.php
rename to include/limesurvey/classes/adodb/session/old/crypt.inc.php
diff --git a/include/limesurvey/classes/adodb5/session/session_schema.xml b/include/limesurvey/classes/adodb/session/session_schema.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/session_schema.xml
rename to include/limesurvey/classes/adodb/session/session_schema.xml
diff --git a/include/limesurvey/classes/adodb5/session/session_schema2.xml b/include/limesurvey/classes/adodb/session/session_schema2.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/session/session_schema2.xml
rename to include/limesurvey/classes/adodb/session/session_schema2.xml
diff --git a/include/limesurvey/classes/adodb5/tests/benchmark.php b/include/limesurvey/classes/adodb/tests/benchmark.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/benchmark.php
rename to include/limesurvey/classes/adodb/tests/benchmark.php
diff --git a/include/limesurvey/classes/adodb5/tests/client.php b/include/limesurvey/classes/adodb/tests/client.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/client.php
rename to include/limesurvey/classes/adodb/tests/client.php
diff --git a/include/limesurvey/classes/adodb5/tests/pdo.php b/include/limesurvey/classes/adodb/tests/pdo.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/pdo.php
rename to include/limesurvey/classes/adodb/tests/pdo.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-active-record.php b/include/limesurvey/classes/adodb/tests/test-active-record.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-active-record.php
rename to include/limesurvey/classes/adodb/tests/test-active-record.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-active-recs2.php b/include/limesurvey/classes/adodb/tests/test-active-recs2.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-active-recs2.php
rename to include/limesurvey/classes/adodb/tests/test-active-recs2.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-active-relations.php b/include/limesurvey/classes/adodb/tests/test-active-relations.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-active-relations.php
rename to include/limesurvey/classes/adodb/tests/test-active-relations.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-active-relationsx.php b/include/limesurvey/classes/adodb/tests/test-active-relationsx.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-active-relationsx.php
rename to include/limesurvey/classes/adodb/tests/test-active-relationsx.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-datadict.php b/include/limesurvey/classes/adodb/tests/test-datadict.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-datadict.php
rename to include/limesurvey/classes/adodb/tests/test-datadict.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-perf.php b/include/limesurvey/classes/adodb/tests/test-perf.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-perf.php
rename to include/limesurvey/classes/adodb/tests/test-perf.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-pgblob.php b/include/limesurvey/classes/adodb/tests/test-pgblob.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-pgblob.php
rename to include/limesurvey/classes/adodb/tests/test-pgblob.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-php5.php b/include/limesurvey/classes/adodb/tests/test-php5.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-php5.php
rename to include/limesurvey/classes/adodb/tests/test-php5.php
diff --git a/include/limesurvey/classes/adodb5/tests/test-xmlschema.php b/include/limesurvey/classes/adodb/tests/test-xmlschema.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test-xmlschema.php
rename to include/limesurvey/classes/adodb/tests/test-xmlschema.php
diff --git a/include/limesurvey/classes/adodb5/tests/test.php b/include/limesurvey/classes/adodb/tests/test.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test.php
rename to include/limesurvey/classes/adodb/tests/test.php
diff --git a/include/limesurvey/classes/adodb5/tests/test2.php b/include/limesurvey/classes/adodb/tests/test2.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test2.php
rename to include/limesurvey/classes/adodb/tests/test2.php
diff --git a/include/limesurvey/classes/adodb5/tests/test3.php b/include/limesurvey/classes/adodb/tests/test3.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test3.php
rename to include/limesurvey/classes/adodb/tests/test3.php
diff --git a/include/limesurvey/classes/adodb5/tests/test4.php b/include/limesurvey/classes/adodb/tests/test4.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test4.php
rename to include/limesurvey/classes/adodb/tests/test4.php
diff --git a/include/limesurvey/classes/adodb5/tests/test5.php b/include/limesurvey/classes/adodb/tests/test5.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test5.php
rename to include/limesurvey/classes/adodb/tests/test5.php
diff --git a/include/limesurvey/classes/adodb5/tests/test_rs_array.php b/include/limesurvey/classes/adodb/tests/test_rs_array.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/test_rs_array.php
rename to include/limesurvey/classes/adodb/tests/test_rs_array.php
diff --git a/include/limesurvey/classes/adodb5/tests/testcache.php b/include/limesurvey/classes/adodb/tests/testcache.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testcache.php
rename to include/limesurvey/classes/adodb/tests/testcache.php
diff --git a/include/limesurvey/classes/adodb5/tests/testdatabases.inc.php b/include/limesurvey/classes/adodb/tests/testdatabases.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testdatabases.inc.php
rename to include/limesurvey/classes/adodb/tests/testdatabases.inc.php
diff --git a/include/limesurvey/classes/adodb5/tests/testgenid.php b/include/limesurvey/classes/adodb/tests/testgenid.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testgenid.php
rename to include/limesurvey/classes/adodb/tests/testgenid.php
diff --git a/include/limesurvey/classes/adodb5/tests/testmssql.php b/include/limesurvey/classes/adodb/tests/testmssql.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testmssql.php
rename to include/limesurvey/classes/adodb/tests/testmssql.php
diff --git a/include/limesurvey/classes/adodb5/tests/testoci8.php b/include/limesurvey/classes/adodb/tests/testoci8.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testoci8.php
rename to include/limesurvey/classes/adodb/tests/testoci8.php
diff --git a/include/limesurvey/classes/adodb5/tests/testoci8cursor.php b/include/limesurvey/classes/adodb/tests/testoci8cursor.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testoci8cursor.php
rename to include/limesurvey/classes/adodb/tests/testoci8cursor.php
diff --git a/include/limesurvey/classes/adodb5/tests/testpaging.php b/include/limesurvey/classes/adodb/tests/testpaging.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testpaging.php
rename to include/limesurvey/classes/adodb/tests/testpaging.php
diff --git a/include/limesurvey/classes/adodb5/tests/testpear.php b/include/limesurvey/classes/adodb/tests/testpear.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testpear.php
rename to include/limesurvey/classes/adodb/tests/testpear.php
diff --git a/include/limesurvey/classes/adodb5/tests/testsessions.php b/include/limesurvey/classes/adodb/tests/testsessions.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/testsessions.php
rename to include/limesurvey/classes/adodb/tests/testsessions.php
diff --git a/include/limesurvey/classes/adodb5/tests/time.php b/include/limesurvey/classes/adodb/tests/time.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/time.php
rename to include/limesurvey/classes/adodb/tests/time.php
diff --git a/include/limesurvey/classes/adodb5/tests/tmssql.php b/include/limesurvey/classes/adodb/tests/tmssql.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/tmssql.php
rename to include/limesurvey/classes/adodb/tests/tmssql.php
diff --git a/include/limesurvey/classes/adodb5/tests/xmlschema-mssql.xml b/include/limesurvey/classes/adodb/tests/xmlschema-mssql.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/xmlschema-mssql.xml
rename to include/limesurvey/classes/adodb/tests/xmlschema-mssql.xml
diff --git a/include/limesurvey/classes/adodb5/tests/xmlschema.xml b/include/limesurvey/classes/adodb/tests/xmlschema.xml
similarity index 100%
rename from include/limesurvey/classes/adodb5/tests/xmlschema.xml
rename to include/limesurvey/classes/adodb/tests/xmlschema.xml
diff --git a/include/limesurvey/classes/adodb5/toexport.inc.php b/include/limesurvey/classes/adodb/toexport.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/toexport.inc.php
rename to include/limesurvey/classes/adodb/toexport.inc.php
diff --git a/include/limesurvey/classes/adodb5/tohtml.inc.php b/include/limesurvey/classes/adodb/tohtml.inc.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/tohtml.inc.php
rename to include/limesurvey/classes/adodb/tohtml.inc.php
diff --git a/include/limesurvey/classes/adodb5/x.php b/include/limesurvey/classes/adodb/x.php
similarity index 100%
rename from include/limesurvey/classes/adodb5/x.php
rename to include/limesurvey/classes/adodb/x.php
diff --git a/include/limesurvey/classes/adodb5/xmlschema.dtd b/include/limesurvey/classes/adodb/xmlschema.dtd
similarity index 100%
rename from include/limesurvey/classes/adodb5/xmlschema.dtd
rename to include/limesurvey/classes/adodb/xmlschema.dtd
diff --git a/include/limesurvey/classes/adodb5/xmlschema03.dtd b/include/limesurvey/classes/adodb/xmlschema03.dtd
similarity index 100%
rename from include/limesurvey/classes/adodb5/xmlschema03.dtd
rename to include/limesurvey/classes/adodb/xmlschema03.dtd
diff --git a/include/limesurvey/classes/adodb5/xsl/convert-0.1-0.2.xsl b/include/limesurvey/classes/adodb/xsl/convert-0.1-0.2.xsl
similarity index 100%
rename from include/limesurvey/classes/adodb5/xsl/convert-0.1-0.2.xsl
rename to include/limesurvey/classes/adodb/xsl/convert-0.1-0.2.xsl
diff --git a/include/limesurvey/classes/adodb5/xsl/convert-0.1-0.3.xsl b/include/limesurvey/classes/adodb/xsl/convert-0.1-0.3.xsl
similarity index 100%
rename from include/limesurvey/classes/adodb5/xsl/convert-0.1-0.3.xsl
rename to include/limesurvey/classes/adodb/xsl/convert-0.1-0.3.xsl
diff --git a/include/limesurvey/classes/adodb5/xsl/convert-0.2-0.1.xsl b/include/limesurvey/classes/adodb/xsl/convert-0.2-0.1.xsl
similarity index 100%
rename from include/limesurvey/classes/adodb5/xsl/convert-0.2-0.1.xsl
rename to include/limesurvey/classes/adodb/xsl/convert-0.2-0.1.xsl
diff --git a/include/limesurvey/classes/adodb5/xsl/convert-0.2-0.3.xsl b/include/limesurvey/classes/adodb/xsl/convert-0.2-0.3.xsl
similarity index 100%
rename from include/limesurvey/classes/adodb5/xsl/convert-0.2-0.3.xsl
rename to include/limesurvey/classes/adodb/xsl/convert-0.2-0.3.xsl
diff --git a/include/limesurvey/classes/adodb5/xsl/remove-0.2.xsl b/include/limesurvey/classes/adodb/xsl/remove-0.2.xsl
similarity index 100%
rename from include/limesurvey/classes/adodb5/xsl/remove-0.2.xsl
rename to include/limesurvey/classes/adodb/xsl/remove-0.2.xsl
diff --git a/include/limesurvey/classes/adodb5/xsl/remove-0.3.xsl b/include/limesurvey/classes/adodb/xsl/remove-0.3.xsl
similarity index 100%
rename from include/limesurvey/classes/adodb5/xsl/remove-0.3.xsl
rename to include/limesurvey/classes/adodb/xsl/remove-0.3.xsl