Push toaster module inside of it

[ericoporto]

I think it would be easier to maintain and provide proper features to both to just maintain them along.