diff --git a/composer.json b/composer.json
index 712660f..4976dc1 100644
--- a/composer.json
+++ b/composer.json
@@ -27,13 +27,11 @@
     },
     "autoload": {
         "psr-4": {
-            "NSWDPC\\Notices\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
+            "NSWDPC\\Notices\\": [
+                "src/Controllers/",
+                "src/Models/"
+            ],
             "NSWDPC\\Notices\\Tests\\": "tests/"
         }
     }
-
 }
diff --git a/src/Controllers/NoticeAdmin.php b/src/Controllers/NoticesAdmin.php
similarity index 100%
rename from src/Controllers/NoticeAdmin.php
rename to src/Controllers/NoticesAdmin.php