restructured handlers, modules