diff --git a/lib/models/SimpleCollection.class.php b/lib/classes/SimpleCollection.class.php
similarity index 100%
rename from lib/models/SimpleCollection.class.php
rename to lib/classes/SimpleCollection.class.php
diff --git a/lib/models/SimpleORMap.class.php b/lib/classes/SimpleORMap.class.php
similarity index 100%
rename from lib/models/SimpleORMap.class.php
rename to lib/classes/SimpleORMap.class.php
diff --git a/lib/models/SimpleORMapCollection.class.php b/lib/classes/SimpleORMapCollection.class.php
similarity index 100%
rename from lib/models/SimpleORMapCollection.class.php
rename to lib/classes/SimpleORMapCollection.class.php
diff --git a/tests/unit/lib/VisualTest.php b/tests/unit/lib/VisualTest.php
index dfa2945bf6dc429607732593860570ec5b4a12d1..c62cd052a0ac4af8899f5663793dcf056805913f 100644
--- a/tests/unit/lib/VisualTest.php
+++ b/tests/unit/lib/VisualTest.php
@@ -9,7 +9,7 @@
  * the License, or (at your option) any later version.
  */
 
-require_once 'lib/models/SimpleORMap.class.php';
+require_once 'lib/classes/SimpleORMap.class.php';
 require_once 'lib/models/OpenGraphURL.class.php';
 require_once 'lib/visual.inc.php';
 require_once 'lib/classes/Config.class.php';
diff --git a/tests/unit/lib/classes/MigrationTest.php b/tests/unit/lib/classes/MigrationTest.php
index 444ebf2fe8e5d5ebcdb3bdbd3da52d289be10c46..4a45e71598c2396b1275c8fc3e499b2e1f20dc23 100644
--- a/tests/unit/lib/classes/MigrationTest.php
+++ b/tests/unit/lib/classes/MigrationTest.php
@@ -16,10 +16,10 @@ class MigrationTest extends \Codeception\Test\Unit
         $this->before = $GLOBALS['CACHING_ENABLE'] ?? null;
         $GLOBALS['CACHING_ENABLE'] = false;
 
+        require_once 'lib/classes/SimpleORMap.class.php';
         require_once 'lib/classes/StudipCache.class.php';
         require_once 'lib/classes/StudipMemoryCache.class.php';
         require_once 'lib/classes/StudipCacheFactory.class.php';
-        require_once 'lib/models/SimpleORMap.class.php';
 
         require_once 'lib/migrations/Migration.php';
         require_once 'lib/migrations/Migrator.php';