diff --git a/composer.json b/composer.json
index 86c2628..c0123d1 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         {
             "name": "webfactory GmbH",
             "email": "info@webfactory.de",
-            "homepage": "http://www.webfactory.de",
+            "homepage": "https://www.webfactory.de",
             "role": "Developer"
         }
     ],
@@ -20,12 +20,12 @@
     },
     "autoload": {
         "psr-4": {
-            "": "src/"
+            "Webfactory\\Dom\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "": "tests/"
+            "Webfactory\\Dom\\Test\\": "tests/"
         }
     },
     "config": {
diff --git a/src/Webfactory/Dom/BaseParsingHelper.php b/src/BaseParsingHelper.php
similarity index 100%
rename from src/Webfactory/Dom/BaseParsingHelper.php
rename to src/BaseParsingHelper.php
diff --git a/src/Webfactory/Dom/Document.php b/src/Document.php
similarity index 100%
rename from src/Webfactory/Dom/Document.php
rename to src/Document.php
diff --git a/src/Webfactory/Dom/Exception/EmptyXMLStringException.php b/src/Exception/EmptyXMLStringException.php
similarity index 100%
rename from src/Webfactory/Dom/Exception/EmptyXMLStringException.php
rename to src/Exception/EmptyXMLStringException.php
diff --git a/src/Webfactory/Dom/Exception/ParsingException.php b/src/Exception/ParsingException.php
similarity index 100%
rename from src/Webfactory/Dom/Exception/ParsingException.php
rename to src/Exception/ParsingException.php
diff --git a/src/Webfactory/Dom/Exception/ParsingHelperException.php b/src/Exception/ParsingHelperException.php
similarity index 100%
rename from src/Webfactory/Dom/Exception/ParsingHelperException.php
rename to src/Exception/ParsingHelperException.php
diff --git a/src/Webfactory/Dom/HTMLParsingHelper.php b/src/HTMLParsingHelper.php
similarity index 100%
rename from src/Webfactory/Dom/HTMLParsingHelper.php
rename to src/HTMLParsingHelper.php
diff --git a/src/Webfactory/Dom/PolyglotHTML5ParsingHelper.php b/src/PolyglotHTML5ParsingHelper.php
similarity index 100%
rename from src/Webfactory/Dom/PolyglotHTML5ParsingHelper.php
rename to src/PolyglotHTML5ParsingHelper.php
diff --git a/src/Webfactory/Dom/XHTML10ParsingHelper.php b/src/XHTML10ParsingHelper.php
similarity index 100%
rename from src/Webfactory/Dom/XHTML10ParsingHelper.php
rename to src/XHTML10ParsingHelper.php
diff --git a/tests/Webfactory/Dom/Test/BaseParsingHelperTest.php b/tests/BaseParsingHelperTest.php
similarity index 100%
rename from tests/Webfactory/Dom/Test/BaseParsingHelperTest.php
rename to tests/BaseParsingHelperTest.php
diff --git a/tests/Webfactory/Dom/Test/HTMLParsingHelperTestCase.php b/tests/HTMLParsingHelperTestCase.php
similarity index 100%
rename from tests/Webfactory/Dom/Test/HTMLParsingHelperTestCase.php
rename to tests/HTMLParsingHelperTestCase.php
diff --git a/tests/Webfactory/Dom/Test/ParsingHelperTestCase.php b/tests/ParsingHelperTestCase.php
similarity index 100%
rename from tests/Webfactory/Dom/Test/ParsingHelperTestCase.php
rename to tests/ParsingHelperTestCase.php
diff --git a/tests/Webfactory/Dom/Test/PolyglotHTML5ParsingHelperTest.php b/tests/PolyglotHTML5ParsingHelperTest.php
similarity index 100%
rename from tests/Webfactory/Dom/Test/PolyglotHTML5ParsingHelperTest.php
rename to tests/PolyglotHTML5ParsingHelperTest.php
diff --git a/tests/Webfactory/Dom/Test/XHTML10ParsingHelperTest.php b/tests/XHTML10ParsingHelperTest.php
similarity index 100%
rename from tests/Webfactory/Dom/Test/XHTML10ParsingHelperTest.php
rename to tests/XHTML10ParsingHelperTest.php