Remove pre-2.6 compatibility, move imports around
Provide a set interface to HTML classes