Restructuring of Notifications API

Still alpha. Needs to checked for correct output.