Move Notification Reminder
Revert "Move Notification Reminder"

This reverts commit 2c856352ff26963e55534d0830c9e468df5ce417.