diff --git a/README.md b/README.md
index f15f4c2..788d0db 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-SREQB
+QB
 ===
 A PHP Query Builder
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 92c3c16..d7a83ee 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
-    "name": "sourcegr/sreqb",
+    "name": "sourcegr/query-builder",
     "type": "library",
-    "description": "SREQB is a query builder for easy SQL queries.",
+    "description": "QB is a query builder for easy SQL queries.",
     "license": "MIT",
     "authors": [
         {
@@ -15,10 +15,10 @@
         "ext-pdo": "*"
     },
     "autoload": {
-        "psr-4": {"Sre\\": "src/"}
+        "psr-4": {"Sourcegr\\QueryBuilder\\": "src/"}
     },
     "autoload-dev": {
-        "psr-4": {"Test\\":  "test/"}
+        "psr-4": {"Tests\\":  "tests/"}
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3"
diff --git a/composer.lock b/composer.lock
index ddc3279..f5f20ac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a2e2e8ef56126cfb4eb3a3cc69f9d736",
+    "content-hash": "9cc9dfc6a0da0c954837ca8670fecd82",
     "packages": [],
     "packages-dev": [
         {
@@ -1049,16 +1049,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "e717aabeafe4eac045d3e947dad3207118664c72"
+                "reference": "7a8ff306445707539c1a6397372a982a1ec55120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e717aabeafe4eac045d3e947dad3207118664c72",
-                "reference": "e717aabeafe4eac045d3e947dad3207118664c72",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/7a8ff306445707539c1a6397372a982a1ec55120",
+                "reference": "7a8ff306445707539c1a6397372a982a1ec55120",
                 "shasum": ""
             },
             "require": {
@@ -1115,7 +1115,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:31:46+00:00"
+            "time": "2020-09-30T06:47:25+00:00"
         },
         {
             "name": "sebastian/complexity",
diff --git a/src/QueryBuilder/DB.php b/src/DB.php
similarity index 88%
rename from src/QueryBuilder/DB.php
rename to src/DB.php
index aa66abe..43324d5 100644
--- a/src/QueryBuilder/DB.php
+++ b/src/DB.php
@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Sre\QueryBuilder;
+namespace Sourcegr\QueryBuilder;
 
 
-use Sre\QueryBuilder\Grammars\MySQL;
+use Sourcegr\QueryBuilder\QueryBuilder\Grammars\MySQL;
 use InvalidArgumentException;
 
 class DB
diff --git a/src/QueryBuilder/Grammars/DeleteErrorException.php b/src/Exceptions/DeleteErrorException.php
similarity index 62%
rename from src/QueryBuilder/Grammars/DeleteErrorException.php
rename to src/Exceptions/DeleteErrorException.php
index aafa173..6bd22d5 100644
--- a/src/QueryBuilder/Grammars/DeleteErrorException.php
+++ b/src/Exceptions/DeleteErrorException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sre\QueryBuilder\Grammars;
+namespace Sourcegr\QueryBuilder\Exceptions;
 
 use Exception;
 
diff --git a/src/QueryBuilder/Grammars/InsertErrorException.php b/src/Exceptions/InsertErrorException.php
similarity index 62%
rename from src/QueryBuilder/Grammars/InsertErrorException.php
rename to src/Exceptions/InsertErrorException.php
index 8bea28e..5bea400 100644
--- a/src/QueryBuilder/Grammars/InsertErrorException.php
+++ b/src/Exceptions/InsertErrorException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sre\QueryBuilder\Grammars;
+namespace Sourcegr\QueryBuilder\Exceptions;
 
 use Exception;
 
diff --git a/src/QueryBuilder/Grammars/SelectErrorException.php b/src/Exceptions/SelectErrorException.php
similarity index 62%
rename from src/QueryBuilder/Grammars/SelectErrorException.php
rename to src/Exceptions/SelectErrorException.php
index 961e0a5..af86186 100644
--- a/src/QueryBuilder/Grammars/SelectErrorException.php
+++ b/src/Exceptions/SelectErrorException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sre\QueryBuilder\Grammars;
+namespace Sourcegr\QueryBuilder\Exceptions;
 
 use Exception;
 
diff --git a/src/QueryBuilder/Grammars/UpdateErrorException.php b/src/Exceptions/UpdateErrorException.php
similarity index 62%
rename from src/QueryBuilder/Grammars/UpdateErrorException.php
rename to src/Exceptions/UpdateErrorException.php
index 0286374..02e7879 100644
--- a/src/QueryBuilder/Grammars/UpdateErrorException.php
+++ b/src/Exceptions/UpdateErrorException.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sre\QueryBuilder\Grammars;
+namespace Sourcegr\QueryBuilder\Exceptions;
 
 use Exception;
 
diff --git a/src/QueryBuilder/Grammars/MySQL.php b/src/Grammars/MySQL.php
similarity index 95%
rename from src/QueryBuilder/Grammars/MySQL.php
rename to src/Grammars/MySQL.php
index 323b8a0..a3a1908 100644
--- a/src/QueryBuilder/Grammars/MySQL.php
+++ b/src/Grammars/MySQL.php
@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Sre\QueryBuilder\Grammars;
+namespace Sourcegr\QueryBuilder\Grammars;
+
 
 use PDO;
 
-use function PHPUnit\Framework\throwException;
 
 class MySQL
 {
@@ -114,7 +114,7 @@ public function delete($sqlString, $sqlParams)
 
         if ($res === false) {
             $info = $st->errorInfo();
-            throw new UpdateErrorException($info[0] . ': ' . $info[2] . ' (' . $info[1] . ')');
+            throw new DeleteErrorException($info[0] . ': ' . $info[2] . ' (' . $info[1] . ')');
         }
 
         return $st->rowCount();
diff --git a/src/QueryBuilder/NotNullAdder.php b/src/NotNullAdder.php
similarity index 94%
rename from src/QueryBuilder/NotNullAdder.php
rename to src/NotNullAdder.php
index 6de5505..00d8d34 100644
--- a/src/QueryBuilder/NotNullAdder.php
+++ b/src/NotNullAdder.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sre\QueryBuilder;
+namespace Sourcegr\QueryBuilder;
 
 
 class NotNullAdder
diff --git a/src/QueryBuilder/Params.php b/src/Params.php
similarity index 99%
rename from src/QueryBuilder/Params.php
rename to src/Params.php
index eae1560..1a1802e 100644
--- a/src/QueryBuilder/Params.php
+++ b/src/Params.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sre\QueryBuilder;
+namespace Sourcegr\QueryBuilder;
 
 
 use function PHPUnit\Framework\isNull;
diff --git a/src/QueryBuilder/QueryBuilder.php b/src/QueryBuilder.php
similarity index 98%
rename from src/QueryBuilder/QueryBuilder.php
rename to src/QueryBuilder.php
index 9380396..cba0766 100644
--- a/src/QueryBuilder/QueryBuilder.php
+++ b/src/QueryBuilder.php
@@ -1,12 +1,11 @@
 <?php
 
 
-namespace Sre\QueryBuilder;
+namespace Sourcegr\QueryBuilder;
 
 
 use InvalidArgumentException;
-use Sre\QueryBuilder\Grammars\MySQL;
-use Sre\QueryBuilder\Grammars\UpdateErrorException;
+use Sourcegr\QueryBuilder\Exceptions\UpdateErrorException;
 
 class QueryBuilder
 {
@@ -28,9 +27,6 @@ class QueryBuilder
 
     private $sqlParams = [];
 
-    /**
-     * @var MySQL
-     */
     private $grammar;
 
 
diff --git a/src/QueryBuilder/Raw.php b/src/Raw.php
similarity index 85%
rename from src/QueryBuilder/Raw.php
rename to src/Raw.php
index 23d66f1..564362b 100644
--- a/src/QueryBuilder/Raw.php
+++ b/src/Raw.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Sre\QueryBuilder;
+namespace Sourcegr\QueryBuilder;
 
 
 class Raw
diff --git a/test/DBTest.php b/tests/DBTest.php
similarity index 92%
rename from test/DBTest.php
rename to tests/DBTest.php
index 1f4f65f..89ff7e9 100644
--- a/test/DBTest.php
+++ b/tests/DBTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Test;
+namespace Tests;
 
 
-use Sre\QueryBuilder\QueryBuilder;
-use Sre\QueryBuilder\DB;
-use Test\Stub\Grammar;
+use Sourcegr\QueryBuilder\QueryBuilder;
+use Sourcegr\QueryBuilder\DB;
+use Tests\Stub\Grammar;
 use ArgumentCountError;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
diff --git a/test/DeleteTest.php b/tests/DeleteTest.php
similarity index 81%
rename from test/DeleteTest.php
rename to tests/DeleteTest.php
index aed292a..6930efb 100644
--- a/test/DeleteTest.php
+++ b/tests/DeleteTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Test;
+namespace Tests;
 
 
-use Sre\QueryBuilder\QueryBuilder;
-use Sre\QueryBuilder\DB;
-use Sre\QueryBuilder\Raw;
-use Sre\QueryBuilder\Grammars\MySQL;
-use Sre\QueryBuilder\Grammars\DeleteErrorException;
-use PHPUnit\Framework\TestCase;
-use Test\Stub\Grammar;
+use Sourcegr\QueryBuilder\QueryBuilder;
+use Sourcegr\QueryBuilder\DB;
+use Sourcegr\QueryBuilder\Raw;
+use Sourcegr\QueryBuilder\Grammars\MySQL;
+use Sourcegr\QueryBuilder\Exceptions\DeleteErrorException;
+use Tests\Stub\Grammar;
 use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
 
 class DeleteTest extends TestCase
 {
diff --git a/test/Grammars/MySQLTest.php b/tests/Grammars/MySQLTest.php
similarity index 95%
rename from test/Grammars/MySQLTest.php
rename to tests/Grammars/MySQLTest.php
index 88ac428..2e8af82 100644
--- a/test/Grammars/MySQLTest.php
+++ b/tests/Grammars/MySQLTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Test\Grammars;
+namespace Tests\Grammars;
 
-use Sre\QueryBuilder\Grammars\MySQL;
+use Sourcegr\QueryBuilder\Grammars\MySQL;
 use PHPUnit\Framework\TestCase;
 
 class MySQLTest extends TestCase
diff --git a/test/InsertTest.php b/tests/InsertTest.php
similarity index 94%
rename from test/InsertTest.php
rename to tests/InsertTest.php
index a9eed43..e63ceb2 100644
--- a/test/InsertTest.php
+++ b/tests/InsertTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Test;
+namespace Tests;
 
 
-use Sre\QueryBuilder\QueryBuilder;
-use Sre\QueryBuilder\DB;
-use Sre\QueryBuilder\Raw;
-use Sre\QueryBuilder\Grammars\MySQL;
-use Sre\QueryBuilder\Grammars\InsertErrorException;
-use PHPUnit\Framework\TestCase;
-use Test\Stub\Grammar;
+use Sourcegr\QueryBuilder\QueryBuilder;
+use Sourcegr\QueryBuilder\DB;
+use Sourcegr\QueryBuilder\Raw;
+use Sourcegr\QueryBuilder\Grammars\MySQL;
+use Sourcegr\QueryBuilder\Exceptions\InsertErrorException;
+use Tests\Stub\Grammar;
 use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
 
 class InsertTest extends TestCase
 {
diff --git a/test/ParamsTest.php b/tests/ParamsTest.php
similarity index 97%
rename from test/ParamsTest.php
rename to tests/ParamsTest.php
index 2d5b410..8e4da68 100644
--- a/test/ParamsTest.php
+++ b/tests/ParamsTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Test;
+namespace Tests;
 
 
-use Sre\QueryBuilder\Params;
+use Sourcegr\QueryBuilder\Params;
 use PHPUnit\Framework\TestCase;
 
 class ParamsTest extends TestCase
diff --git a/test/QueryBuilderTest.php b/tests/QueryBuilderTest.php
similarity index 95%
rename from test/QueryBuilderTest.php
rename to tests/QueryBuilderTest.php
index be8d1a4..606b7bd 100644
--- a/test/QueryBuilderTest.php
+++ b/tests/QueryBuilderTest.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Test;
+namespace Tests;
 
 
-use Sre\QueryBuilder\QueryBuilder;
-use Sre\QueryBuilder\DB;
-use Sre\QueryBuilder\Grammars\MySQL;
+use Sourcegr\QueryBuilder\QueryBuilder;
+use Sourcegr\QueryBuilder\DB;
+use Sourcegr\QueryBuilder\Grammars\MySQL;
+use Tests\Stub\Grammar;
 use PHPUnit\Framework\TestCase;
-use \Test\Stub\Grammar;
+
 
 class QueryBuilderTest extends TestCase
 {
diff --git a/test/SelectTest.php b/tests/SelectTest.php
similarity index 98%
rename from test/SelectTest.php
rename to tests/SelectTest.php
index 0339ba3..dde2684 100644
--- a/test/SelectTest.php
+++ b/tests/SelectTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Test;
+namespace Tests;
 
 
-use Sre\QueryBuilder\QueryBuilder;
-use Sre\QueryBuilder\DB;
-use Sre\QueryBuilder\Grammars\MySQL;
+use Sourcegr\QueryBuilder\QueryBuilder;
+use Sourcegr\QueryBuilder\DB;
+use Sourcegr\QueryBuilder\Grammars\MySQL;
+use Sourcegr\QueryBuilder\Raw;
+use Tests\Stub\Grammar;
 use PHPUnit\Framework\TestCase;
-use Sre\QueryBuilder\Raw;
-use \Test\Stub\Grammar;
 
 class SelectTest extends TestCase
 {
diff --git a/test/Stub/Grammar.php b/tests/Stub/Grammar.php
similarity index 97%
rename from test/Stub/Grammar.php
rename to tests/Stub/Grammar.php
index f7ab9f3..2d11f71 100644
--- a/test/Stub/Grammar.php
+++ b/tests/Stub/Grammar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Test\Stub;
+namespace Tests\Stub;
 
 class Grammar
 {
diff --git a/test/UpdateTest.php b/tests/UpdateTest.php
similarity index 92%
rename from test/UpdateTest.php
rename to tests/UpdateTest.php
index fb606f1..de8626f 100644
--- a/test/UpdateTest.php
+++ b/tests/UpdateTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Test;
+namespace Tests;
 
 
-use Sre\QueryBuilder\QueryBuilder;
-use Sre\QueryBuilder\DB;
-use Sre\QueryBuilder\Raw;
-use Sre\QueryBuilder\Grammars\MySQL;
-use Sre\QueryBuilder\Grammars\UpdateErrorException;
-use PHPUnit\Framework\TestCase;
-use Test\Stub\Grammar;
+use Sourcegr\QueryBuilder\QueryBuilder;
+use Sourcegr\QueryBuilder\DB;
+use Sourcegr\QueryBuilder\Raw;
+use Sourcegr\QueryBuilder\Grammars\MySQL;
+use Sourcegr\QueryBuilder\Exceptions\UpdateErrorException;
+use Tests\Stub\Grammar;
 use InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
 
 class UpdateTest extends TestCase
 {