diff --git a/lib/private/db/adapter.php b/lib/private/DB/Adapter.php
similarity index 100%
rename from lib/private/db/adapter.php
rename to lib/private/DB/Adapter.php
diff --git a/lib/private/db/adaptermysql.php b/lib/private/DB/AdapterMySQL.php
similarity index 100%
rename from lib/private/db/adaptermysql.php
rename to lib/private/DB/AdapterMySQL.php
diff --git a/lib/private/db/adapteroci8.php b/lib/private/DB/AdapterOCI8.php
similarity index 100%
rename from lib/private/db/adapteroci8.php
rename to lib/private/DB/AdapterOCI8.php
diff --git a/lib/private/db/adapterpgsql.php b/lib/private/DB/AdapterPgSql.php
similarity index 100%
rename from lib/private/db/adapterpgsql.php
rename to lib/private/DB/AdapterPgSql.php
diff --git a/lib/private/db/adaptersqlite.php b/lib/private/DB/AdapterSqlite.php
similarity index 100%
rename from lib/private/db/adaptersqlite.php
rename to lib/private/DB/AdapterSqlite.php
diff --git a/lib/private/db/connection.php b/lib/private/DB/Connection.php
similarity index 100%
rename from lib/private/db/connection.php
rename to lib/private/DB/Connection.php
diff --git a/lib/private/db/connectionfactory.php b/lib/private/DB/ConnectionFactory.php
similarity index 100%
rename from lib/private/db/connectionfactory.php
rename to lib/private/DB/ConnectionFactory.php
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/DB/MDB2SchemaManager.php
similarity index 100%
rename from lib/private/db/mdb2schemamanager.php
rename to lib/private/DB/MDB2SchemaManager.php
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/DB/MDB2SchemaReader.php
similarity index 100%
rename from lib/private/db/mdb2schemareader.php
rename to lib/private/DB/MDB2SchemaReader.php
diff --git a/lib/private/db/mdb2schemawriter.php b/lib/private/DB/MDB2SchemaWriter.php
similarity index 100%
rename from lib/private/db/mdb2schemawriter.php
rename to lib/private/DB/MDB2SchemaWriter.php
diff --git a/lib/private/db/migrationexception.php b/lib/private/DB/MigrationException.php
similarity index 100%
rename from lib/private/db/migrationexception.php
rename to lib/private/DB/MigrationException.php
diff --git a/lib/private/db/migrator.php b/lib/private/DB/Migrator.php
similarity index 100%
rename from lib/private/db/migrator.php
rename to lib/private/DB/Migrator.php
diff --git a/lib/private/db/mysqlmigrator.php b/lib/private/DB/MySQLMigrator.php
similarity index 100%
rename from lib/private/db/mysqlmigrator.php
rename to lib/private/DB/MySQLMigrator.php
diff --git a/lib/private/db/nocheckmigrator.php b/lib/private/DB/NoCheckMigrator.php
similarity index 100%
rename from lib/private/db/nocheckmigrator.php
rename to lib/private/DB/NoCheckMigrator.php
diff --git a/lib/private/db/ocsqliteplatform.php b/lib/private/DB/OCSqlitePlatform.php
similarity index 100%
rename from lib/private/db/ocsqliteplatform.php
rename to lib/private/DB/OCSqlitePlatform.php
diff --git a/lib/private/db/oracleconnection.php b/lib/private/DB/OracleConnection.php
similarity index 100%
rename from lib/private/db/oracleconnection.php
rename to lib/private/DB/OracleConnection.php
diff --git a/lib/private/db/oraclemigrator.php b/lib/private/DB/OracleMigrator.php
similarity index 100%
rename from lib/private/db/oraclemigrator.php
rename to lib/private/DB/OracleMigrator.php
diff --git a/lib/private/db/pgsqltools.php b/lib/private/DB/PgSqlTools.php
similarity index 100%
rename from lib/private/db/pgsqltools.php
rename to lib/private/DB/PgSqlTools.php
diff --git a/lib/private/db/querybuilder/compositeexpression.php b/lib/private/DB/QueryBuilder/CompositeExpression.php
similarity index 100%
rename from lib/private/db/querybuilder/compositeexpression.php
rename to lib/private/DB/QueryBuilder/CompositeExpression.php
diff --git a/lib/private/db/querybuilder/expressionbuilder/expressionbuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
similarity index 100%
rename from lib/private/db/querybuilder/expressionbuilder/expressionbuilder.php
rename to lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
diff --git a/lib/private/db/querybuilder/expressionbuilder/mysqlexpressionbuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
similarity index 100%
rename from lib/private/db/querybuilder/expressionbuilder/mysqlexpressionbuilder.php
rename to lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
diff --git a/lib/private/db/querybuilder/expressionbuilder/ociexpressionbuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php
similarity index 100%
rename from lib/private/db/querybuilder/expressionbuilder/ociexpressionbuilder.php
rename to lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php
diff --git a/lib/private/db/querybuilder/expressionbuilder/pgsqlexpressionbuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php
similarity index 100%
rename from lib/private/db/querybuilder/expressionbuilder/pgsqlexpressionbuilder.php
rename to lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php
diff --git a/lib/private/db/querybuilder/literal.php b/lib/private/DB/QueryBuilder/Literal.php
similarity index 100%
rename from lib/private/db/querybuilder/literal.php
rename to lib/private/DB/QueryBuilder/Literal.php
diff --git a/lib/private/db/querybuilder/parameter.php b/lib/private/DB/QueryBuilder/Parameter.php
similarity index 100%
rename from lib/private/db/querybuilder/parameter.php
rename to lib/private/DB/QueryBuilder/Parameter.php
diff --git a/lib/private/db/querybuilder/querybuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
similarity index 100%
rename from lib/private/db/querybuilder/querybuilder.php
rename to lib/private/DB/QueryBuilder/QueryBuilder.php
diff --git a/lib/private/db/querybuilder/queryfunction.php b/lib/private/DB/QueryBuilder/QueryFunction.php
similarity index 100%
rename from lib/private/db/querybuilder/queryfunction.php
rename to lib/private/DB/QueryBuilder/QueryFunction.php
diff --git a/lib/private/db/querybuilder/quotehelper.php b/lib/private/DB/QueryBuilder/QuoteHelper.php
similarity index 100%
rename from lib/private/db/querybuilder/quotehelper.php
rename to lib/private/DB/QueryBuilder/QuoteHelper.php
diff --git a/lib/private/db/sqlitemigrator.php b/lib/private/DB/SQLiteMigrator.php
similarity index 100%
rename from lib/private/db/sqlitemigrator.php
rename to lib/private/DB/SQLiteMigrator.php
diff --git a/lib/private/db/sqlitesessioninit.php b/lib/private/DB/SQLiteSessionInit.php
similarity index 100%
rename from lib/private/db/sqlitesessioninit.php
rename to lib/private/DB/SQLiteSessionInit.php
diff --git a/lib/private/db/statementwrapper.php b/lib/private/legacy/db/statementwrapper.php
similarity index 100%
rename from lib/private/db/statementwrapper.php
rename to lib/private/legacy/db/statementwrapper.php