diff --git a/classes/exceptions/AlltubeLibraryException.php b/classes/Exception/AlltubeLibraryException.php
similarity index 100%
rename from classes/exceptions/AlltubeLibraryException.php
rename to classes/Exception/AlltubeLibraryException.php
diff --git a/classes/exceptions/AvconvException.php b/classes/Exception/AvconvException.php
similarity index 100%
rename from classes/exceptions/AvconvException.php
rename to classes/Exception/AvconvException.php
diff --git a/classes/exceptions/EmptyUrlException.php b/classes/Exception/EmptyUrlException.php
similarity index 100%
rename from classes/exceptions/EmptyUrlException.php
rename to classes/Exception/EmptyUrlException.php
diff --git a/classes/exceptions/InvalidProtocolConversionException.php b/classes/Exception/InvalidProtocolConversionException.php
similarity index 100%
rename from classes/exceptions/InvalidProtocolConversionException.php
rename to classes/Exception/InvalidProtocolConversionException.php
diff --git a/classes/exceptions/InvalidTimeException.php b/classes/Exception/InvalidTimeException.php
similarity index 100%
rename from classes/exceptions/InvalidTimeException.php
rename to classes/Exception/InvalidTimeException.php
diff --git a/classes/exceptions/PasswordException.php b/classes/Exception/PasswordException.php
similarity index 100%
rename from classes/exceptions/PasswordException.php
rename to classes/Exception/PasswordException.php
diff --git a/classes/exceptions/PlaylistConversionException.php b/classes/Exception/PlaylistConversionException.php
similarity index 100%
rename from classes/exceptions/PlaylistConversionException.php
rename to classes/Exception/PlaylistConversionException.php
diff --git a/classes/exceptions/PopenStreamException.php b/classes/Exception/PopenStreamException.php
similarity index 100%
rename from classes/exceptions/PopenStreamException.php
rename to classes/Exception/PopenStreamException.php
diff --git a/classes/exceptions/RemuxException.php b/classes/Exception/RemuxException.php
similarity index 100%
rename from classes/exceptions/RemuxException.php
rename to classes/Exception/RemuxException.php
diff --git a/classes/exceptions/WrongPasswordException.php b/classes/Exception/WrongPasswordException.php
similarity index 100%
rename from classes/exceptions/WrongPasswordException.php
rename to classes/Exception/WrongPasswordException.php
diff --git a/classes/exceptions/YoutubedlException.php b/classes/Exception/YoutubedlException.php
similarity index 100%
rename from classes/exceptions/YoutubedlException.php
rename to classes/Exception/YoutubedlException.php
diff --git a/composer.json b/composer.json
index 8984422..8385c9b 100644
--- a/composer.json
+++ b/composer.json
@@ -26,8 +26,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Alltube\\Library\\": "classes/",
-      "Alltube\\Library\\Exception\\": "classes/exceptions/"
+      "Alltube\\Library\\": "classes/"
     }
   }
 }