diff --git a/composer.json b/composer.json
index 23013d9..b950399 100644
--- a/composer.json
+++ b/composer.json
@@ -15,11 +15,6 @@
   "require": {
         "php": ">=7.0.0"
   },
-  "scripts" : {
-        "post-file-download": [
-            "sed -i 's#//namespace Domframework#namespace Domframework#' *.php"
-        ]
-  },
   "autoload": {
         "exclude-from-classmap": ["/docs/", "/doc/", "/debian/", "/cover/", "/Tests/", "/locale/", "/tools/"]
     }
diff --git a/auth.php b/src/auth.php
similarity index 100%
rename from auth.php
rename to src/auth.php
diff --git a/authentication.php b/src/authentication.php
similarity index 100%
rename from authentication.php
rename to src/authentication.php
diff --git a/authhtpasswd.php b/src/authhtpasswd.php
similarity index 100%
rename from authhtpasswd.php
rename to src/authhtpasswd.php
diff --git a/authimap.php b/src/authimap.php
similarity index 100%
rename from authimap.php
rename to src/authimap.php
diff --git a/authjwt.php b/src/authjwt.php
similarity index 100%
rename from authjwt.php
rename to src/authjwt.php
diff --git a/authldap.php b/src/authldap.php
similarity index 100%
rename from authldap.php
rename to src/authldap.php
diff --git a/authorization.php b/src/authorization.php
similarity index 100%
rename from authorization.php
rename to src/authorization.php
diff --git a/authorizationdb.php b/src/authorizationdb.php
similarity index 100%
rename from authorizationdb.php
rename to src/authorizationdb.php
diff --git a/authparams.php b/src/authparams.php
similarity index 100%
rename from authparams.php
rename to src/authparams.php
diff --git a/authsession.php b/src/authsession.php
similarity index 100%
rename from authsession.php
rename to src/authsession.php
diff --git a/authshibboleth.php b/src/authshibboleth.php
similarity index 100%
rename from authshibboleth.php
rename to src/authshibboleth.php
diff --git a/authsql.php b/src/authsql.php
similarity index 100%
rename from authsql.php
rename to src/authsql.php
diff --git a/authsympa.php b/src/authsympa.php
similarity index 100%
rename from authsympa.php
rename to src/authsympa.php
diff --git a/authzgroups.php b/src/authzgroups.php
similarity index 100%
rename from authzgroups.php
rename to src/authzgroups.php
diff --git a/authzgroupsoo.php b/src/authzgroupsoo.php
similarity index 100%
rename from authzgroupsoo.php
rename to src/authzgroupsoo.php
diff --git a/backtrace.php b/src/backtrace.php
similarity index 100%
rename from backtrace.php
rename to src/backtrace.php
diff --git a/cachefile.php b/src/cachefile.php
similarity index 100%
rename from cachefile.php
rename to src/cachefile.php
diff --git a/cacheoutput.php b/src/cacheoutput.php
similarity index 100%
rename from cacheoutput.php
rename to src/cacheoutput.php
diff --git a/certificationauthority.php b/src/certificationauthority.php
similarity index 100%
rename from certificationauthority.php
rename to src/certificationauthority.php
diff --git a/cli.php b/src/cli.php
similarity index 100%
rename from cli.php
rename to src/cli.php
diff --git a/color.php b/src/color.php
similarity index 100%
rename from color.php
rename to src/color.php
diff --git a/config.php b/src/config.php
similarity index 100%
rename from config.php
rename to src/config.php
diff --git a/console.php b/src/console.php
similarity index 100%
rename from console.php
rename to src/console.php
diff --git a/convert.php b/src/convert.php
similarity index 100%
rename from convert.php
rename to src/convert.php
diff --git a/csrf.php b/src/csrf.php
similarity index 100%
rename from csrf.php
rename to src/csrf.php
diff --git a/daemon.php b/src/daemon.php
similarity index 100%
rename from daemon.php
rename to src/daemon.php
diff --git a/dbjson.php b/src/dbjson.php
similarity index 100%
rename from dbjson.php
rename to src/dbjson.php
diff --git a/dblayer.php b/src/dblayer.php
similarity index 100%
rename from dblayer.php
rename to src/dblayer.php
diff --git a/dblayerauthzgroups.php b/src/dblayerauthzgroups.php
similarity index 100%
rename from dblayerauthzgroups.php
rename to src/dblayerauthzgroups.php
diff --git a/dblayeroo.php b/src/dblayeroo.php
similarity index 100%
rename from dblayeroo.php
rename to src/dblayeroo.php
diff --git a/encrypt.php b/src/encrypt.php
similarity index 100%
rename from encrypt.php
rename to src/encrypt.php
diff --git a/file.php b/src/file.php
similarity index 100%
rename from file.php
rename to src/file.php
diff --git a/fork.php b/src/fork.php
similarity index 100%
rename from fork.php
rename to src/fork.php
diff --git a/form.php b/src/form.php
similarity index 100%
rename from form.php
rename to src/form.php
diff --git a/fts.php b/src/fts.php
similarity index 100%
rename from fts.php
rename to src/fts.php
diff --git a/getopts.php b/src/getopts.php
similarity index 100%
rename from getopts.php
rename to src/getopts.php
diff --git a/graph.php b/src/graph.php
similarity index 100%
rename from graph.php
rename to src/graph.php
diff --git a/http.php b/src/http.php
similarity index 100%
rename from http.php
rename to src/http.php
diff --git a/httpclient.php b/src/httpclient.php
similarity index 100%
rename from httpclient.php
rename to src/httpclient.php
diff --git a/imap.php b/src/imap.php
similarity index 100%
rename from imap.php
rename to src/imap.php
diff --git a/inifile.php b/src/inifile.php
similarity index 100%
rename from inifile.php
rename to src/inifile.php
diff --git a/ipaddresses.php b/src/ipaddresses.php
similarity index 100%
rename from ipaddresses.php
rename to src/ipaddresses.php
diff --git a/jwt.php b/src/jwt.php
similarity index 100%
rename from jwt.php
rename to src/jwt.php
diff --git a/language.php b/src/language.php
similarity index 100%
rename from language.php
rename to src/language.php
diff --git a/lockfile.php b/src/lockfile.php
similarity index 100%
rename from lockfile.php
rename to src/lockfile.php
diff --git a/logger.php b/src/logger.php
similarity index 100%
rename from logger.php
rename to src/logger.php
diff --git a/macaddresses.php b/src/macaddresses.php
similarity index 100%
rename from macaddresses.php
rename to src/macaddresses.php
diff --git a/mail.php b/src/mail.php
similarity index 100%
rename from mail.php
rename to src/mail.php
diff --git a/markdown.php b/src/markdown.php
similarity index 100%
rename from markdown.php
rename to src/markdown.php
diff --git a/module.php b/src/module.php
similarity index 100%
rename from module.php
rename to src/module.php
diff --git a/output.php b/src/output.php
similarity index 100%
rename from output.php
rename to src/output.php
diff --git a/outputcsv.php b/src/outputcsv.php
similarity index 100%
rename from outputcsv.php
rename to src/outputcsv.php
diff --git a/outputdl.php b/src/outputdl.php
similarity index 100%
rename from outputdl.php
rename to src/outputdl.php
diff --git a/outputhtml.php b/src/outputhtml.php
similarity index 100%
rename from outputhtml.php
rename to src/outputhtml.php
diff --git a/outputjson.php b/src/outputjson.php
similarity index 100%
rename from outputjson.php
rename to src/outputjson.php
diff --git a/outputrest.php b/src/outputrest.php
similarity index 100%
rename from outputrest.php
rename to src/outputrest.php
diff --git a/outputtxt.php b/src/outputtxt.php
similarity index 100%
rename from outputtxt.php
rename to src/outputtxt.php
diff --git a/outputxml.php b/src/outputxml.php
similarity index 100%
rename from outputxml.php
rename to src/outputxml.php
diff --git a/password.php b/src/password.php
similarity index 100%
rename from password.php
rename to src/password.php
diff --git a/queue.php b/src/queue.php
similarity index 100%
rename from queue.php
rename to src/queue.php
diff --git a/queuefile.php b/src/queuefile.php
similarity index 100%
rename from queuefile.php
rename to src/queuefile.php
diff --git a/ratelimit.php b/src/ratelimit.php
similarity index 100%
rename from ratelimit.php
rename to src/ratelimit.php
diff --git a/ratelimitfile.php b/src/ratelimitfile.php
similarity index 100%
rename from ratelimitfile.php
rename to src/ratelimitfile.php
diff --git a/renderer.php b/src/renderer.php
similarity index 100%
rename from renderer.php
rename to src/renderer.php
diff --git a/rest.php b/src/rest.php
similarity index 100%
rename from rest.php
rename to src/rest.php
diff --git a/robotstxt.php b/src/robotstxt.php
similarity index 100%
rename from robotstxt.php
rename to src/robotstxt.php
diff --git a/route.php b/src/route.php
similarity index 100%
rename from route.php
rename to src/route.php
diff --git a/routeSQL.php b/src/routeSQL.php
similarity index 100%
rename from routeSQL.php
rename to src/routeSQL.php
diff --git a/rss.php b/src/rss.php
similarity index 100%
rename from rss.php
rename to src/rss.php
diff --git a/sitemap.php b/src/sitemap.php
similarity index 100%
rename from sitemap.php
rename to src/sitemap.php
diff --git a/smtp.php b/src/smtp.php
similarity index 100%
rename from smtp.php
rename to src/smtp.php
diff --git a/spfcheck.php b/src/spfcheck.php
similarity index 100%
rename from spfcheck.php
rename to src/spfcheck.php
diff --git a/sse.php b/src/sse.php
similarity index 100%
rename from sse.php
rename to src/sse.php
diff --git a/tcpclient.php b/src/tcpclient.php
similarity index 100%
rename from tcpclient.php
rename to src/tcpclient.php
diff --git a/tcpserver.php b/src/tcpserver.php
similarity index 100%
rename from tcpserver.php
rename to src/tcpserver.php
diff --git a/users.php b/src/users.php
similarity index 100%
rename from users.php
rename to src/users.php
diff --git a/userssql.php b/src/userssql.php
similarity index 100%
rename from userssql.php
rename to src/userssql.php
diff --git a/uuid.php b/src/uuid.php
similarity index 100%
rename from uuid.php
rename to src/uuid.php
diff --git a/verify.php b/src/verify.php
similarity index 100%
rename from verify.php
rename to src/verify.php
diff --git a/version.php b/src/version.php
similarity index 100%
rename from version.php
rename to src/version.php
diff --git a/xdiff.php b/src/xdiff.php
similarity index 100%
rename from xdiff.php
rename to src/xdiff.php
diff --git a/xmppclient.php b/src/xmppclient.php
similarity index 100%
rename from xmppclient.php
rename to src/xmppclient.php