diff --git a/Makefile b/Makefile
index 179d794..d43db37 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ copy-img:
 
 copy-php:
 	cp -v $(CURDIR)/src/static/php/*.php $(CURDIR)/build/php/
-	cp -v $(CURDIR)/src/Classes/*.php $(CURDIR)/build/php/src/Classes/
+	cp -v $(CURDIR)/src/Classes/*.php $(CURDIR)/build/php/Classes/
 
 install: installdirs
 	cp -rv $(CURDIR)/build/* $(DESTDIR)/
@@ -100,5 +100,5 @@ purge-container:
 	fi;		
 
 builddirs:
-	mkdir -p $(CURDIR)/build $(CURDIR)/build/img $(CURDIR)/build/html $(CURDIR)/build/html/min $(CURDIR)/build/html/unmin $(CURDIR)/build/js $(CURDIR)/build/css $(CURDIR)/build/php $(CURDIR)/build/php/src $(CURDIR)/build/php/src/Classes $(CURDIR)/build/public
+	mkdir -p $(CURDIR)/build $(CURDIR)/build/img $(CURDIR)/build/html $(CURDIR)/build/html/min $(CURDIR)/build/html/unmin $(CURDIR)/build/js $(CURDIR)/build/css $(CURDIR)/build/php $(CURDIR)/build/php/Classes  $(CURDIR)/build/public
 
diff --git a/src/composer.json b/src/composer.json
index 6c1a256..71ec1a5 100644
--- a/src/composer.json
+++ b/src/composer.json
@@ -5,8 +5,7 @@
   "license": "GPL-3.0",
   "autoload": {
     "psr-4": {
-      "Pomf\\Uguu\\": "src/",
-      "Pomf\\Uguu\\Classes\\": "src/Classes"
+      "Uguu\\": "Classes"
     }
   },
   "authors": [