more theme work, some module restructuring.