diff --git a/app/Handlers/Events/APIEventHandler.php b/app/Handlers/Events/APIEventHandler.php
index b3fdd0222c..bbfdd150bd 100644
--- a/app/Handlers/Events/APIEventHandler.php
+++ b/app/Handlers/Events/APIEventHandler.php
@@ -44,6 +44,7 @@ class APIEventHandler
      *
      * @return bool
      * @throws FireflyException
+     * @deprecated
      */
     public function accessTokenCreated(AccessTokenCreated $event): bool
     {
diff --git a/app/Handlers/Events/AdminEventHandler.php b/app/Handlers/Events/AdminEventHandler.php
index d35ab1c2c4..4e5ca63630 100644
--- a/app/Handlers/Events/AdminEventHandler.php
+++ b/app/Handlers/Events/AdminEventHandler.php
@@ -43,6 +43,7 @@ class AdminEventHandler
      *
      * @return bool
      * @throws FireflyException
+     * @deprecated
      */
     public function sendTestMessage(AdminRequestedTestMessage $event): bool
     {
diff --git a/app/Handlers/Events/AutomationHandler.php b/app/Handlers/Events/AutomationHandler.php
index cd72404822..4ec1d9725f 100644
--- a/app/Handlers/Events/AutomationHandler.php
+++ b/app/Handlers/Events/AutomationHandler.php
@@ -43,6 +43,7 @@ class AutomationHandler
      * @param RequestedReportOnJournals $event
      *
      * @return bool
+     * @deprecated
      */
     public function reportJournals(RequestedReportOnJournals $event): bool
     {
diff --git a/app/Handlers/Events/BillEventHandler.php b/app/Handlers/Events/BillEventHandler.php
index 21b04d7cce..946fce2a9f 100644
--- a/app/Handlers/Events/BillEventHandler.php
+++ b/app/Handlers/Events/BillEventHandler.php
@@ -38,6 +38,7 @@ class BillEventHandler
      * @param WarnUserAboutBill $event
      * @return void
      * @throws \FireflyIII\Exceptions\FireflyException
+     * @deprecated
      */
     public function warnAboutBill(WarnUserAboutBill $event): void
     {
diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index f4f206b9a8..aea2e8a5c1 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -193,6 +193,7 @@ class UserEventHandler
      * @param DetectedNewIPAddress $event
      *
      * @throws FireflyException
+     * @deprecated
      */
     public function notifyNewIPAddress(DetectedNewIPAddress $event): void
     {
@@ -235,6 +236,7 @@ class UserEventHandler
      *
      * @return bool
      * @throws FireflyException
+     * @deprecated
      */
     public function sendEmailChangeConfirmMail(UserChangedEmail $event): bool
     {
@@ -260,6 +262,7 @@ class UserEventHandler
      *
      * @return bool
      * @throws FireflyException
+     * @deprecated
      */
     public function sendEmailChangeUndoMail(UserChangedEmail $event): bool
     {
@@ -281,7 +284,7 @@ class UserEventHandler
 
     /**
      * Send a new password to the user.
-     *
+     * @deprecated
      * @param RequestedNewPassword $event
      *
      * @return bool
@@ -312,6 +315,7 @@ class UserEventHandler
      * @param RegisteredUser $event
      *
      * @return bool
+     * @deprecated
      * @throws FireflyException
      */
     public function sendRegistrationMail(RegisteredUser $event): bool
diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.php
index 6485f1d042..c247f007f8 100644
--- a/app/Handlers/Events/VersionCheckEventHandler.php
+++ b/app/Handlers/Events/VersionCheckEventHandler.php
@@ -46,6 +46,7 @@ class VersionCheckEventHandler
      * @throws FireflyException
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
+     * @deprecated ?
      */
     public function checkForUpdates(RequestedVersionCheckStatus $event): void
     {
diff --git a/app/Notifications/Admin/TestNotification.php b/app/Notifications/Admin/TestNotification.php
new file mode 100644
index 0000000000..380abfd3da
--- /dev/null
+++ b/app/Notifications/Admin/TestNotification.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * TestNotification.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\Admin;
+
+class TestNotification
+{
+
+}
diff --git a/app/Notifications/Admin/UserInvitation.php b/app/Notifications/Admin/UserInvitation.php
new file mode 100644
index 0000000000..edca00feac
--- /dev/null
+++ b/app/Notifications/Admin/UserInvitation.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * UserInvitation.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\Admin;
+
+class UserInvitation
+{
+
+}
diff --git a/app/Notifications/Admin/UserRegistration.php b/app/Notifications/Admin/UserRegistration.php
new file mode 100644
index 0000000000..f5f6196feb
--- /dev/null
+++ b/app/Notifications/Admin/UserRegistration.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * UserRegistration.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\Admin;
+
+class UserRegistration
+{
+
+}
diff --git a/app/Notifications/Admin/VersionCheckResult.php b/app/Notifications/Admin/VersionCheckResult.php
new file mode 100644
index 0000000000..a493c6fe9d
--- /dev/null
+++ b/app/Notifications/Admin/VersionCheckResult.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * VersionCheckResult.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\Admin;
+
+class VersionCheckResult
+{
+
+}
diff --git a/app/Notifications/User/BillReminder.php b/app/Notifications/User/BillReminder.php
new file mode 100644
index 0000000000..bd9337ae09
--- /dev/null
+++ b/app/Notifications/User/BillReminder.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * BillReminder.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\User;
+
+class BillReminder
+{
+
+}
diff --git a/app/Notifications/User/NewAccessToken.php b/app/Notifications/User/NewAccessToken.php
new file mode 100644
index 0000000000..d7f71364b1
--- /dev/null
+++ b/app/Notifications/User/NewAccessToken.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * NewAccessToken.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\User;
+
+class NewAccessToken
+{
+
+}
diff --git a/app/Notifications/User/TransactionCreation.php b/app/Notifications/User/TransactionCreation.php
new file mode 100644
index 0000000000..7a4418d4c9
--- /dev/null
+++ b/app/Notifications/User/TransactionCreation.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * TransactionCreation.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\User;
+
+class TransactionCreation
+{
+
+}
diff --git a/app/Notifications/User/UserLogin.php b/app/Notifications/User/UserLogin.php
new file mode 100644
index 0000000000..b2f53e2d21
--- /dev/null
+++ b/app/Notifications/User/UserLogin.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * UserLogin.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\User;
+
+class UserLogin
+{
+
+}
diff --git a/app/Notifications/User/UserNewEmail.php b/app/Notifications/User/UserNewEmail.php
new file mode 100644
index 0000000000..65bca7db69
--- /dev/null
+++ b/app/Notifications/User/UserNewEmail.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * UserNewEmail.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\User;
+
+class UserNewEmail
+{
+
+}
diff --git a/app/Notifications/User/UserNewEmailUndo.php b/app/Notifications/User/UserNewEmailUndo.php
new file mode 100644
index 0000000000..c8dda18353
--- /dev/null
+++ b/app/Notifications/User/UserNewEmailUndo.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * UserNewEmailUndo.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\User;
+
+class UserNewEmailUndo
+{
+
+}
diff --git a/app/Notifications/User/UserNewPassword.php b/app/Notifications/User/UserNewPassword.php
new file mode 100644
index 0000000000..3c02b1be93
--- /dev/null
+++ b/app/Notifications/User/UserNewPassword.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * UserNewPassword.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Notifications\User;
+
+class UserNewPassword
+{
+
+}