diff --git a/bin/createNewsEntry b/bin/createNewsEntry
index baae69935..2e0209e85 100755
--- a/bin/createNewsEntry
+++ b/bin/createNewsEntry
@@ -2,7 +2,7 @@
 <?php
 PHP_SAPI == 'cli' or die("Please run this script using the cli sapi");
 
-require_once __DIR__ . '/../autoload.php';
+require_once __DIR__ . '/../src/autoload.php';
 
 use phpweb\News\Entry;
 
diff --git a/bin/createReleaseEntry b/bin/createReleaseEntry
index cd98b83d0..38d8fa794 100755
--- a/bin/createReleaseEntry
+++ b/bin/createReleaseEntry
@@ -2,7 +2,7 @@
 <?php
 PHP_SAPI == 'cli' or die("Please run this script using the cli sapi");
 
-require_once __DIR__ . '/../autoload.php';
+require_once __DIR__ . '/../src/autoload.php';
 
 use phpweb\News\Entry;
 
diff --git a/include/shared-manual.inc b/include/shared-manual.inc
index 5b973140e..8e457b764 100644
--- a/include/shared-manual.inc
+++ b/include/shared-manual.inc
@@ -22,7 +22,7 @@ $PGI = []; $SIDEBAR_DATA = '';
 // User note display functions
 // =============================================================================
 
-require_once __DIR__ . '/../autoload.php';
+require_once __DIR__ . '/../src/autoload.php';
 
 use phpweb\UserNotes\Sorter;
 use phpweb\UserNotes\UserNote;
diff --git a/autoload.php b/src/autoload.php
similarity index 94%
rename from autoload.php
rename to src/autoload.php
index 5625b6062..7ae42625c 100644
--- a/autoload.php
+++ b/src/autoload.php
@@ -5,7 +5,7 @@
  */
 spl_autoload_register(static function (string $class): void {
     $prefix = 'phpweb\\';
-    $directory = __DIR__ . '/src/';
+    $directory = __DIR__ . '/';
 
     $length = strlen($prefix);
 
diff --git a/tests/UserNotes/Sorter/sort-no-notes.phpt b/tests/UserNotes/Sorter/sort-no-notes.phpt
index 3162da17d..2bfc988c0 100644
--- a/tests/UserNotes/Sorter/sort-no-notes.phpt
+++ b/tests/UserNotes/Sorter/sort-no-notes.phpt
@@ -8,7 +8,7 @@ precision=-1
 use phpweb\UserNotes\Sorter;
 use phpweb\UserNotes\UserNote;
 
-require_once __DIR__ . "/../../../autoload.php";
+require_once __DIR__ . "/../../../src/autoload.php";
 
 $notes = [];
 
diff --git a/tests/UserNotes/Sorter/sort-notes-full.phpt b/tests/UserNotes/Sorter/sort-notes-full.phpt
index 31328a6cd..008d79084 100644
--- a/tests/UserNotes/Sorter/sort-notes-full.phpt
+++ b/tests/UserNotes/Sorter/sort-notes-full.phpt
@@ -8,7 +8,7 @@ precision=-1
 use phpweb\UserNotes\Sorter;
 use phpweb\UserNotes\UserNote;
 
-require_once __DIR__ . "/../../../autoload.php";
+require_once __DIR__ . "/../../../src/autoload.php";
 
 $file = file(__DIR__ . "/../../../backend/notes/d7/d7742c269d23ea86");
 $notes = [];
diff --git a/tests/UserNotes/Sorter/sort-single-note-with-no-votes.phpt b/tests/UserNotes/Sorter/sort-single-note-with-no-votes.phpt
index 5e13ef569..2c02366f3 100644
--- a/tests/UserNotes/Sorter/sort-single-note-with-no-votes.phpt
+++ b/tests/UserNotes/Sorter/sort-single-note-with-no-votes.phpt
@@ -8,7 +8,7 @@ precision=-1
 use phpweb\UserNotes\Sorter;
 use phpweb\UserNotes\UserNote;
 
-require_once __DIR__ . "/../../../autoload.php";
+require_once __DIR__ . "/../../../src/autoload.php";
 
 $notes = [
     new UserNote('1', '', '', '1613487094', '', '', 0, 0),
diff --git a/tests/UserNotes/Sorter/sort-some-notes.phpt b/tests/UserNotes/Sorter/sort-some-notes.phpt
index 108a8fb90..02f7d5321 100644
--- a/tests/UserNotes/Sorter/sort-some-notes.phpt
+++ b/tests/UserNotes/Sorter/sort-some-notes.phpt
@@ -8,7 +8,7 @@ precision=-1
 use phpweb\UserNotes\Sorter;
 use phpweb\UserNotes\UserNote;
 
-require_once __DIR__ . "/../../../autoload.php";
+require_once __DIR__ . "/../../../src/autoload.php";
 
 $notes = [
     new UserNote('1', '', '', '1613487094', '', '', 0, 2),