Merging Subscrption/Nofication files

I am committing these files to the local branch.