diff --git a/docs/LIVESTATUS_COLUMNS b/doc/LIVESTATUS_COLUMNS
similarity index 100%
rename from docs/LIVESTATUS_COLUMNS
rename to doc/LIVESTATUS_COLUMNS
diff --git a/docs/ORACLE b/doc/ORACLE
similarity index 100%
rename from docs/ORACLE
rename to doc/ORACLE
diff --git a/docs/README.txt b/doc/README.txt
old mode 100755
new mode 100644
similarity index 100%
rename from docs/README.txt
rename to doc/README.txt
diff --git a/tests/javascript/.PLACEHOLDER b/test/frontend/.PLACEHOLDER
similarity index 100%
rename from tests/javascript/.PLACEHOLDER
rename to test/frontend/.PLACEHOLDER
diff --git a/tests/ui/.PLACEHOLDER b/test/javascript/.PLACEHOLDER
similarity index 100%
rename from tests/ui/.PLACEHOLDER
rename to test/javascript/.PLACEHOLDER
diff --git a/tests/php/application/views/helpers/PerfdataTest.php b/test/php/application/views/helpers/PerfdataTest.php
similarity index 100%
rename from tests/php/application/views/helpers/PerfdataTest.php
rename to test/php/application/views/helpers/PerfdataTest.php
diff --git a/tests/php/application/views/helpers/QUrlTest.php b/test/php/application/views/helpers/QUrlTest.php
similarity index 100%
rename from tests/php/application/views/helpers/QUrlTest.php
rename to test/php/application/views/helpers/QUrlTest.php
diff --git a/tests/php/application/views/helpers/QlinkTest.php b/test/php/application/views/helpers/QlinkTest.php
similarity index 100%
rename from tests/php/application/views/helpers/QlinkTest.php
rename to test/php/application/views/helpers/QlinkTest.php
diff --git a/tests/php/application/views/helpers/RenderServicePerfdataTest.php b/test/php/application/views/helpers/RenderServicePerfdataTest.php
similarity index 100%
rename from tests/php/application/views/helpers/RenderServicePerfdataTest.php
rename to test/php/application/views/helpers/RenderServicePerfdataTest.php
diff --git a/tests/php/application/views/helpers/TimeSinceTest.php b/test/php/application/views/helpers/TimeSinceTest.php
similarity index 100%
rename from tests/php/application/views/helpers/TimeSinceTest.php
rename to test/php/application/views/helpers/TimeSinceTest.php
diff --git a/tests/php/application/views/helpers/UtilTest.php b/test/php/application/views/helpers/UtilTest.php
similarity index 100%
rename from tests/php/application/views/helpers/UtilTest.php
rename to test/php/application/views/helpers/UtilTest.php
diff --git a/tests/php/bin/README b/test/php/bin/README
similarity index 100%
rename from tests/php/bin/README
rename to test/php/bin/README
diff --git a/tests/php/bin/common.h b/test/php/bin/common.h
similarity index 100%
rename from tests/php/bin/common.h
rename to test/php/bin/common.h
diff --git a/tests/php/bin/extcmd_test.c b/test/php/bin/extcmd_test.c
similarity index 100%
rename from tests/php/bin/extcmd_test.c
rename to test/php/bin/extcmd_test.c
diff --git a/tests/php/bin/shared.h b/test/php/bin/shared.h
similarity index 100%
rename from tests/php/bin/shared.h
rename to test/php/bin/shared.h
diff --git a/tests/php/library/Icinga/Application/BootstrapTest.php b/test/php/library/Icinga/Application/BootstrapTest.php
similarity index 100%
rename from tests/php/library/Icinga/Application/BootstrapTest.php
rename to test/php/library/Icinga/Application/BootstrapTest.php
diff --git a/tests/php/library/Icinga/Application/ConfigTest.php b/test/php/library/Icinga/Application/ConfigTest.php
similarity index 100%
rename from tests/php/library/Icinga/Application/ConfigTest.php
rename to test/php/library/Icinga/Application/ConfigTest.php
diff --git a/tests/php/library/Icinga/Application/LoaderTest.php b/test/php/library/Icinga/Application/LoaderTest.php
similarity index 100%
rename from tests/php/library/Icinga/Application/LoaderTest.php
rename to test/php/library/Icinga/Application/LoaderTest.php
diff --git a/tests/php/library/Icinga/Application/LoggerTest.php b/test/php/library/Icinga/Application/LoggerTest.php
similarity index 100%
rename from tests/php/library/Icinga/Application/LoggerTest.php
rename to test/php/library/Icinga/Application/LoggerTest.php
diff --git a/tests/php/library/Icinga/Application/SessionTest.php b/test/php/library/Icinga/Application/SessionTest.php
similarity index 100%
rename from tests/php/library/Icinga/Application/SessionTest.php
rename to test/php/library/Icinga/Application/SessionTest.php
diff --git a/tests/php/library/Icinga/Backend/ComboTest.php b/test/php/library/Icinga/Backend/ComboTest.php
similarity index 100%
rename from tests/php/library/Icinga/Backend/ComboTest.php
rename to test/php/library/Icinga/Backend/ComboTest.php
diff --git a/tests/php/library/Icinga/Backend/IdoTest.php b/test/php/library/Icinga/Backend/IdoTest.php
similarity index 100%
rename from tests/php/library/Icinga/Backend/IdoTest.php
rename to test/php/library/Icinga/Backend/IdoTest.php
diff --git a/tests/php/library/Icinga/Backend/LivestatusTest.php b/test/php/library/Icinga/Backend/LivestatusTest.php
similarity index 100%
rename from tests/php/library/Icinga/Backend/LivestatusTest.php
rename to test/php/library/Icinga/Backend/LivestatusTest.php
diff --git a/tests/php/library/Icinga/Backend/MonitoringObjectListTest.php b/test/php/library/Icinga/Backend/MonitoringObjectListTest.php
similarity index 100%
rename from tests/php/library/Icinga/Backend/MonitoringObjectListTest.php
rename to test/php/library/Icinga/Backend/MonitoringObjectListTest.php
diff --git a/tests/php/library/Icinga/Backend/Statusdat/ServicegroupsummaryQueryTest.php b/test/php/library/Icinga/Backend/Statusdat/ServicegroupsummaryQueryTest.php
similarity index 100%
rename from tests/php/library/Icinga/Backend/Statusdat/ServicegroupsummaryQueryTest.php
rename to test/php/library/Icinga/Backend/Statusdat/ServicegroupsummaryQueryTest.php
diff --git a/tests/php/library/Icinga/Backend/Statusdat/ServicelistQueryTest.php b/test/php/library/Icinga/Backend/Statusdat/ServicelistQueryTest.php
similarity index 100%
rename from tests/php/library/Icinga/Backend/Statusdat/ServicelistQueryTest.php
rename to test/php/library/Icinga/Backend/Statusdat/ServicelistQueryTest.php
diff --git a/tests/php/library/Icinga/Backend/StatusdatTest.php b/test/php/library/Icinga/Backend/StatusdatTest.php
similarity index 100%
rename from tests/php/library/Icinga/Backend/StatusdatTest.php
rename to test/php/library/Icinga/Backend/StatusdatTest.php
diff --git a/tests/php/library/Icinga/BackendTest.php b/test/php/library/Icinga/BackendTest.php
similarity index 100%
rename from tests/php/library/Icinga/BackendTest.php
rename to test/php/library/Icinga/BackendTest.php
diff --git a/tests/php/library/Icinga/BenchmarkTest.php b/test/php/library/Icinga/BenchmarkTest.php
similarity index 100%
rename from tests/php/library/Icinga/BenchmarkTest.php
rename to test/php/library/Icinga/BenchmarkTest.php
diff --git a/tests/php/library/Icinga/ConfigTest.php b/test/php/library/Icinga/ConfigTest.php
similarity index 100%
rename from tests/php/library/Icinga/ConfigTest.php
rename to test/php/library/Icinga/ConfigTest.php
diff --git a/tests/php/library/Icinga/FormatTest.php b/test/php/library/Icinga/FormatTest.php
similarity index 100%
rename from tests/php/library/Icinga/FormatTest.php
rename to test/php/library/Icinga/FormatTest.php
diff --git a/tests/php/library/Icinga/Ido/DbTest.php b/test/php/library/Icinga/Ido/DbTest.php
similarity index 100%
rename from tests/php/library/Icinga/Ido/DbTest.php
rename to test/php/library/Icinga/Ido/DbTest.php
diff --git a/tests/php/library/Icinga/Protocol/Commandpipe/AcknowledgementTest.php b/test/php/library/Icinga/Protocol/Commandpipe/AcknowledgementTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Commandpipe/AcknowledgementTest.php
rename to test/php/library/Icinga/Protocol/Commandpipe/AcknowledgementTest.php
diff --git a/tests/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php b/test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php
rename to test/php/library/Icinga/Protocol/Commandpipe/CommandPipeTest.php
diff --git a/tests/php/library/Icinga/Protocol/Ldap/ConnectionTest.php b/test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
rename to test/php/library/Icinga/Protocol/Ldap/ConnectionTest.php
diff --git a/tests/php/library/Icinga/Protocol/Ldap/LdapUtilsTest.php b/test/php/library/Icinga/Protocol/Ldap/LdapUtilsTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Ldap/LdapUtilsTest.php
rename to test/php/library/Icinga/Protocol/Ldap/LdapUtilsTest.php
diff --git a/tests/php/library/Icinga/Protocol/Ldap/NodeTest.php b/test/php/library/Icinga/Protocol/Ldap/NodeTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Ldap/NodeTest.php
rename to test/php/library/Icinga/Protocol/Ldap/NodeTest.php
diff --git a/tests/php/library/Icinga/Protocol/Ldap/QueryTest.php b/test/php/library/Icinga/Protocol/Ldap/QueryTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Ldap/QueryTest.php
rename to test/php/library/Icinga/Protocol/Ldap/QueryTest.php
diff --git a/tests/php/library/Icinga/Protocol/Ldap/RootTest.php b/test/php/library/Icinga/Protocol/Ldap/RootTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Ldap/RootTest.php
rename to test/php/library/Icinga/Protocol/Ldap/RootTest.php
diff --git a/tests/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php b/test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php
rename to test/php/library/Icinga/Protocol/Livestatus/ConnectionTest.php
diff --git a/tests/php/library/Icinga/Protocol/Livestatus/QueryTest.php b/test/php/library/Icinga/Protocol/Livestatus/QueryTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Livestatus/QueryTest.php
rename to test/php/library/Icinga/Protocol/Livestatus/QueryTest.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/Component/StatusdatComponentTest.php b/test/php/library/Icinga/Protocol/Statusdat/Component/StatusdatComponentTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/Component/StatusdatComponentTest.php
rename to test/php/library/Icinga/Protocol/Statusdat/Component/StatusdatComponentTest.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/Component/objects.cache b/test/php/library/Icinga/Protocol/Statusdat/Component/objects.cache
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/Component/objects.cache
rename to test/php/library/Icinga/Protocol/Statusdat/Component/objects.cache
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/Component/status.dat b/test/php/library/Icinga/Protocol/Statusdat/Component/status.dat
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/Component/status.dat
rename to test/php/library/Icinga/Protocol/Statusdat/Component/status.dat
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/Exceptions/ParsingException.php b/test/php/library/Icinga/Protocol/Statusdat/Exceptions/ParsingException.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/Exceptions/ParsingException.php
rename to test/php/library/Icinga/Protocol/Statusdat/Exceptions/ParsingException.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/ParserTest.php b/test/php/library/Icinga/Protocol/Statusdat/ParserTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/ParserTest.php
rename to test/php/library/Icinga/Protocol/Statusdat/ParserTest.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/Query/ExpressionTest.php b/test/php/library/Icinga/Protocol/Statusdat/Query/ExpressionTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/Query/ExpressionTest.php
rename to test/php/library/Icinga/Protocol/Statusdat/Query/ExpressionTest.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/Query/GroupTest.php b/test/php/library/Icinga/Protocol/Statusdat/Query/GroupTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/Query/GroupTest.php
rename to test/php/library/Icinga/Protocol/Statusdat/Query/GroupTest.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/QueryTest.php b/test/php/library/Icinga/Protocol/Statusdat/QueryTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/QueryTest.php
rename to test/php/library/Icinga/Protocol/Statusdat/QueryTest.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/ReaderMock.php b/test/php/library/Icinga/Protocol/Statusdat/ReaderMock.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/ReaderMock.php
rename to test/php/library/Icinga/Protocol/Statusdat/ReaderMock.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/ReaderTest.php b/test/php/library/Icinga/Protocol/Statusdat/ReaderTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/ReaderTest.php
rename to test/php/library/Icinga/Protocol/Statusdat/ReaderTest.php
diff --git a/tests/php/library/Icinga/Protocol/Statusdat/RuntimeStateContainerTest.php b/test/php/library/Icinga/Protocol/Statusdat/RuntimeStateContainerTest.php
similarity index 100%
rename from tests/php/library/Icinga/Protocol/Statusdat/RuntimeStateContainerTest.php
rename to test/php/library/Icinga/Protocol/Statusdat/RuntimeStateContainerTest.php
diff --git a/tests/php/library/Icinga/Web/ActionControllerTest.php b/test/php/library/Icinga/Web/ActionControllerTest.php
similarity index 100%
rename from tests/php/library/Icinga/Web/ActionControllerTest.php
rename to test/php/library/Icinga/Web/ActionControllerTest.php
diff --git a/tests/php/library/Icinga/Web/HookTest.php b/test/php/library/Icinga/Web/HookTest.php
similarity index 100%
rename from tests/php/library/Icinga/Web/HookTest.php
rename to test/php/library/Icinga/Web/HookTest.php
diff --git a/tests/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php b/test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
similarity index 100%
rename from tests/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
rename to test/php/library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorderTest.php
diff --git a/tests/php/res/status/objects.icinga2.cache b/test/php/res/status/objects.icinga2.cache
similarity index 100%
rename from tests/php/res/status/objects.icinga2.cache
rename to test/php/res/status/objects.icinga2.cache
diff --git a/tests/php/res/status/status.icinga2.dat b/test/php/res/status/status.icinga2.dat
similarity index 100%
rename from tests/php/res/status/status.icinga2.dat
rename to test/php/res/status/status.icinga2.dat
diff --git a/tests/php/res/status/status.small.dat b/test/php/res/status/status.small.dat
similarity index 100%
rename from tests/php/res/status/status.small.dat
rename to test/php/res/status/status.small.dat