Updated tom match latest swx ubuntu packages.
Restructured classes into a puppet module 'sxw'.