Remove notifications onresume
Moved classes around