Converted as naively as possible from previous beta. Removed html notifications, since webkit doesn't support them anymore
Moved classes to more sane packages
removed unnecessary class