diff --git a/system/arrayClass/Aux/LegacyAux.php b/system/ArrayClass/Aux/LegacyAux.php
similarity index 100%
rename from system/arrayClass/Aux/LegacyAux.php
rename to system/ArrayClass/Aux/LegacyAux.php
diff --git a/system/arrayClass/Aux/ModernAux.php b/system/ArrayClass/Aux/ModernAux.php
similarity index 100%
rename from system/arrayClass/Aux/ModernAux.php
rename to system/ArrayClass/Aux/ModernAux.php
diff --git a/system/arrayClass/CaseInsensitiveArray.php b/system/ArrayClass/CaseInsensitiveArray.php
similarity index 100%
rename from system/arrayClass/CaseInsensitiveArray.php
rename to system/ArrayClass/CaseInsensitiveArray.php
diff --git a/system/MagiQL/Api/BuilderInterface.php b/system/MagiQL/Api/BuilderInterface.php
index 2a9c693..b892dd3 100644
--- a/system/MagiQL/Api/BuilderInterface.php
+++ b/system/MagiQL/Api/BuilderInterface.php
@@ -21,14 +21,6 @@ interface BuilderInterface
      * @return string
      */
     public function write(QueryInterface $query);
-
-    /**
-     * @param QueryInterface $query
-     *
-     * @return string
-     */
-    public function writeFormatted(QueryInterface $query);
-
     
     /**
      * @param \Phacil\Framework\MagiQL\Syntax\Table $table 
diff --git a/system/database/databases/dbmysqli.php b/system/database/Databases/dbmysqli.php
similarity index 100%
rename from system/database/databases/dbmysqli.php
rename to system/database/Databases/dbmysqli.php
diff --git a/system/database/databases/mpdo.php b/system/database/Databases/mpdo.php
similarity index 100%
rename from system/database/databases/mpdo.php
rename to system/database/Databases/mpdo.php
diff --git a/system/database/databases/mssql.php b/system/database/Databases/mssql.php
similarity index 100%
rename from system/database/databases/mssql.php
rename to system/database/Databases/mssql.php
diff --git a/system/database/databases/mysql.php b/system/database/Databases/mysql.php
similarity index 100%
rename from system/database/databases/mysql.php
rename to system/database/Databases/mysql.php
diff --git a/system/database/databases/mysql_legacy.php b/system/database/Databases/mysql_legacy.php
similarity index 100%
rename from system/database/databases/mysql_legacy.php
rename to system/database/Databases/mysql_legacy.php
diff --git a/system/database/databases/mysql_pdo.php b/system/database/Databases/mysql_pdo.php
similarity index 100%
rename from system/database/databases/mysql_pdo.php
rename to system/database/Databases/mysql_pdo.php
diff --git a/system/database/databases/mysqli.php b/system/database/Databases/mysqli.php
similarity index 100%
rename from system/database/databases/mysqli.php
rename to system/database/Databases/mysqli.php
diff --git a/system/database/databases/nullStatement.php b/system/database/Databases/nullStatement.php
similarity index 100%
rename from system/database/databases/nullStatement.php
rename to system/database/Databases/nullStatement.php
diff --git a/system/database/databases/object/Aux/ComplementItem.php b/system/database/Databases/object/Aux/ComplementItem.php
similarity index 100%
rename from system/database/databases/object/Aux/ComplementItem.php
rename to system/database/Databases/object/Aux/ComplementItem.php
diff --git a/system/database/databases/object/Aux/ComplementItemLegacy.php b/system/database/Databases/object/Aux/ComplementItemLegacy.php
similarity index 100%
rename from system/database/databases/object/Aux/ComplementItemLegacy.php
rename to system/database/Databases/object/Aux/ComplementItemLegacy.php
diff --git a/system/database/databases/object/Aux/ComplementResult.php b/system/database/Databases/object/Aux/ComplementResult.php
similarity index 100%
rename from system/database/databases/object/Aux/ComplementResult.php
rename to system/database/Databases/object/Aux/ComplementResult.php
diff --git a/system/database/databases/object/Aux/ComplementResultLegacy.php b/system/database/Databases/object/Aux/ComplementResultLegacy.php
similarity index 100%
rename from system/database/databases/object/Aux/ComplementResultLegacy.php
rename to system/database/Databases/object/Aux/ComplementResultLegacy.php
diff --git a/system/database/databases/object/item.php b/system/database/Databases/object/item.php
similarity index 100%
rename from system/database/databases/object/item.php
rename to system/database/Databases/object/item.php
diff --git a/system/database/databases/object/itemInterface.php b/system/database/Databases/object/itemInterface.php
similarity index 100%
rename from system/database/databases/object/itemInterface.php
rename to system/database/Databases/object/itemInterface.php
diff --git a/system/database/databases/object/result.php b/system/database/Databases/object/result.php
similarity index 100%
rename from system/database/databases/object/result.php
rename to system/database/Databases/object/result.php
diff --git a/system/database/databases/object/resultInterface.php b/system/database/Databases/object/resultInterface.php
similarity index 100%
rename from system/database/databases/object/resultInterface.php
rename to system/database/Databases/object/resultInterface.php
diff --git a/system/database/databases/oracle.php b/system/database/Databases/oracle.php
similarity index 100%
rename from system/database/databases/oracle.php
rename to system/database/Databases/oracle.php
diff --git a/system/database/databases/oracle_pdo.php b/system/database/Databases/oracle_pdo.php
similarity index 100%
rename from system/database/databases/oracle_pdo.php
rename to system/database/Databases/oracle_pdo.php
diff --git a/system/database/databases/postgre.php b/system/database/Databases/postgre.php
similarity index 100%
rename from system/database/databases/postgre.php
rename to system/database/Databases/postgre.php
diff --git a/system/database/databases/sqlite3_db.php b/system/database/Databases/sqlite3_db.php
similarity index 100%
rename from system/database/databases/sqlite3_db.php
rename to system/database/Databases/sqlite3_db.php
diff --git a/system/database/databases/sqlsrv.php b/system/database/Databases/sqlsrv.php
similarity index 100%
rename from system/database/databases/sqlsrv.php
rename to system/database/Databases/sqlsrv.php
diff --git a/system/database/databases/sqlsrvpdo.php b/system/database/Databases/sqlsrvpdo.php
similarity index 100%
rename from system/database/databases/sqlsrvpdo.php
rename to system/database/Databases/sqlsrvpdo.php