Moves larger util classes to their own files, fixes up the notification service to ensure notifications go away properly.