diff --git a/tests/_output/.placeholder b/tests/_output/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/codeception.dist.yml b/tests/codeception/codeception.dist.yml
similarity index 74%
rename from tests/codeception.dist.yml
rename to tests/codeception/codeception.dist.yml
index 7ab8e2de7..d78ef33d3 100644
--- a/tests/codeception.dist.yml
+++ b/tests/codeception/codeception.dist.yml
@@ -1,9 +1,9 @@
 actor: Tester
 paths:
-    tests: codeception
-    log: codeception/_output
-    data: codeception/_data
-    helpers: codeception/_support
+    tests: tests
+    log: _output
+    data: _data
+    helpers: _support
 settings:
     bootstrap: _bootstrap.php
     colors: true
@@ -14,7 +14,7 @@ modules:
             dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
             user: 'fhcomplete'
             password: 'fhcomplete'
-            dump: codeception/_data/dump.sql
+            dump: _data/dump.sql
             populate: true
             cleanup: false
             reconnect: false
diff --git a/tests/codeception/acceptance.suite.dist.yml b/tests/codeception/tests/acceptance.suite.dist.yml
similarity index 93%
rename from tests/codeception/acceptance.suite.dist.yml
rename to tests/codeception/tests/acceptance.suite.dist.yml
index 616dd916a..3ca32aed8 100644
--- a/tests/codeception/acceptance.suite.dist.yml
+++ b/tests/codeception/tests/acceptance.suite.dist.yml
@@ -17,7 +17,7 @@ modules:
             dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
             user: 'fhcomplete'
             password: 'fhcomplete'
-            dump: codeception/_data/dump.sql
+            dump: _data/dump.sql
             populate: true
             cleanup: false
             reconnect: false
diff --git a/tests/codeception/acceptance/AcceptanceTester.php b/tests/codeception/tests/acceptance/AcceptanceTester.php
similarity index 100%
rename from tests/codeception/acceptance/AcceptanceTester.php
rename to tests/codeception/tests/acceptance/AcceptanceTester.php
diff --git a/tests/codeception/acceptance/CISLoginPage.php b/tests/codeception/tests/acceptance/CISLoginPage.php
similarity index 100%
rename from tests/codeception/acceptance/CISLoginPage.php
rename to tests/codeception/tests/acceptance/CISLoginPage.php
diff --git a/tests/codeception/acceptance/VileSciSearchPersonCept.php b/tests/codeception/tests/acceptance/VileSciSearchPersonCept.php
similarity index 100%
rename from tests/codeception/acceptance/VileSciSearchPersonCept.php
rename to tests/codeception/tests/acceptance/VileSciSearchPersonCept.php
diff --git a/tests/codeception/acceptance/VileSciStartPage.php b/tests/codeception/tests/acceptance/VileSciStartPage.php
similarity index 100%
rename from tests/codeception/acceptance/VileSciStartPage.php
rename to tests/codeception/tests/acceptance/VileSciStartPage.php
diff --git a/tests/codeception/acceptance/_bootstrap.php b/tests/codeception/tests/acceptance/_bootstrap.php
similarity index 100%
rename from tests/codeception/acceptance/_bootstrap.php
rename to tests/codeception/tests/acceptance/_bootstrap.php
diff --git a/tests/codeception/api.suite.dist.yml b/tests/codeception/tests/api.suite.dist.yml
similarity index 92%
rename from tests/codeception/api.suite.dist.yml
rename to tests/codeception/tests/api.suite.dist.yml
index e1132b077..b156918a2 100644
--- a/tests/codeception/api.suite.dist.yml
+++ b/tests/codeception/tests/api.suite.dist.yml
@@ -15,7 +15,7 @@ modules:
             dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
             user: 'fhcomplete'
             password: 'fhcomplete'
-            dump: codeception/_data/dump.sql
+            dump: _data/dump.sql
             populate: true
             cleanup: false
             reconnect: false
diff --git a/tests/codeception/api/_bootstrap.php b/tests/codeception/tests/api/_bootstrap.php
similarity index 100%
rename from tests/codeception/api/_bootstrap.php
rename to tests/codeception/tests/api/_bootstrap.php
diff --git a/tests/codeception/api/v1/BasicLoginCept.php b/tests/codeception/tests/api/v1/BasicLoginCept.php
similarity index 100%
rename from tests/codeception/api/v1/BasicLoginCept.php
rename to tests/codeception/tests/api/v1/BasicLoginCept.php
diff --git a/tests/codeception/api/v1/CourseCept.php b/tests/codeception/tests/api/v1/CourseCept.php
similarity index 100%
rename from tests/codeception/api/v1/CourseCept.php
rename to tests/codeception/tests/api/v1/CourseCept.php
diff --git a/tests/codeception/api/v1/DigestLogin.php b/tests/codeception/tests/api/v1/DigestLogin.php
similarity index 100%
rename from tests/codeception/api/v1/DigestLogin.php
rename to tests/codeception/tests/api/v1/DigestLogin.php
diff --git a/tests/codeception/api/v1/NationCept.php b/tests/codeception/tests/api/v1/NationCept.php
similarity index 100%
rename from tests/codeception/api/v1/NationCept.php
rename to tests/codeception/tests/api/v1/NationCept.php
diff --git a/tests/codeception/api/v1/PersonCept.php b/tests/codeception/tests/api/v1/PersonCept.php
similarity index 100%
rename from tests/codeception/api/v1/PersonCept.php
rename to tests/codeception/tests/api/v1/PersonCept.php
diff --git a/tests/codeception/api/v1/PlanCept.php b/tests/codeception/tests/api/v1/PlanCept.php
similarity index 100%
rename from tests/codeception/api/v1/PlanCept.php
rename to tests/codeception/tests/api/v1/PlanCept.php
diff --git a/tests/codeception/functional.suite.dist.yml b/tests/codeception/tests/functional.suite.dist.yml
similarity index 100%
rename from tests/codeception/functional.suite.dist.yml
rename to tests/codeception/tests/functional.suite.dist.yml
diff --git a/tests/codeception/functional/FunctionalTester.php b/tests/codeception/tests/functional/FunctionalTester.php
similarity index 100%
rename from tests/codeception/functional/FunctionalTester.php
rename to tests/codeception/tests/functional/FunctionalTester.php
diff --git a/tests/codeception/functional/_bootstrap.php b/tests/codeception/tests/functional/_bootstrap.php
similarity index 100%
rename from tests/codeception/functional/_bootstrap.php
rename to tests/codeception/tests/functional/_bootstrap.php
diff --git a/tests/codeception/unit.suite.dist.yml b/tests/codeception/tests/unit.suite.dist.yml
similarity index 100%
rename from tests/codeception/unit.suite.dist.yml
rename to tests/codeception/tests/unit.suite.dist.yml
diff --git a/tests/codeception/unit/BasisKlasseTest.php b/tests/codeception/tests/unit/BasisKlasseTest.php
similarity index 83%
rename from tests/codeception/unit/BasisKlasseTest.php
rename to tests/codeception/tests/unit/BasisKlasseTest.php
index c598355ac..932c2a1ed 100644
--- a/tests/codeception/unit/BasisKlasseTest.php
+++ b/tests/codeception/tests/unit/BasisKlasseTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__).'/../../../include/basis.class.php');
+require_once(dirname(__FILE__).'/../../../../include/basis.class.php');
 
 class ExampleTest extends \Codeception\TestCase\Test
 {
diff --git a/tests/codeception/unit/UnitTester.php b/tests/codeception/tests/unit/UnitTester.php
similarity index 100%
rename from tests/codeception/unit/UnitTester.php
rename to tests/codeception/tests/unit/UnitTester.php
diff --git a/tests/codeception/unit/_bootstrap.php b/tests/codeception/tests/unit/_bootstrap.php
similarity index 100%
rename from tests/codeception/unit/_bootstrap.php
rename to tests/codeception/tests/unit/_bootstrap.php