Step 3 of Notification + cleanup of all imports

+ this one is broken badly on the mvn clean install with an inability to do the @Autowire injections. Will try to figure the path through that - in the meantime, the actual system @Autowires work fine.