diff --git a/src/Classes/Connector.php b/src/Classes/Connector.php
index fb57b26..1ba6f00 100644
--- a/src/Classes/Connector.php
+++ b/src/Classes/Connector.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu;
+    namespace Pomf\Uguu\Classes;
     
     use Exception;
     use PDO;
diff --git a/src/Classes/CuteGrills.php b/src/Classes/CuteGrills.php
index 82018ce..af10590 100644
--- a/src/Classes/CuteGrills.php
+++ b/src/Classes/CuteGrills.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu;
+    namespace Pomf\Uguu\Classes;
     
     class CuteGrills
     {
diff --git a/src/Classes/Database.php b/src/Classes/Database.php
index 252f435..52ba22e 100644
--- a/src/Classes/Database.php
+++ b/src/Classes/Database.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu;
+    namespace Pomf\Uguu\Classes;
     
     use Exception;
     use PDO;
diff --git a/src/Classes/GrillLoader.php b/src/Classes/GrillLoader.php
index f0f8323..7fbbfa6 100644
--- a/src/Classes/GrillLoader.php
+++ b/src/Classes/GrillLoader.php
@@ -20,8 +20,6 @@
     
     namespace Pomf\Uguu\Classes;
     
-    use Pomf\Uguu\CuteGrills;
-    
     class GrillLoader extends CuteGrills
     {
         public function __construct()
diff --git a/src/Classes/Response.php b/src/Classes/Response.php
index 8ff7367..7c2fe4f 100644
--- a/src/Classes/Response.php
+++ b/src/Classes/Response.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu;
+    namespace Pomf\Uguu\Classes;
     
     class Response
     {
diff --git a/src/Classes/Upload.php b/src/Classes/Upload.php
index c70a0af..b092cfe 100644
--- a/src/Classes/Upload.php
+++ b/src/Classes/Upload.php
@@ -18,7 +18,7 @@
      * along with this program.  If not, see <https://www.gnu.org/licenses/>.
      */
     
-    namespace Pomf\Uguu;
+    namespace Pomf\Uguu\Classes;
     
     use Exception;
     
diff --git a/src/Classes/UploadGateway.php b/src/Classes/UploadGateway.php
index 66d7b10..6e66aeb 100644
--- a/src/Classes/UploadGateway.php
+++ b/src/Classes/UploadGateway.php
@@ -21,10 +21,6 @@
     namespace Pomf\Uguu\Classes;
     
     use Exception;
-    use Pomf\Uguu\Response;
-    use Pomf\Uguu\Upload;
-    
-    use function Pomf\Uguu\count;
     
     class UploadGateway extends Upload
     {
diff --git a/src/composer.json b/src/composer.json
index ba718a8..4e07864 100644
--- a/src/composer.json
+++ b/src/composer.json
@@ -5,8 +5,8 @@
   "license": "GPL-3.0",
   "autoload": {
     "psr-4": {
-      "Pomf\\Uguu\\": "/",
-      "Pomf\\Uguu\\Classes\\": "src/Classes"
+      "Pomf\\Uguu\\": "./",
+      "Pomf\\Uguu\\Classes\\": "./Classes"
     }
   },
   "authors": [