Reorganized patchers.
Reorganized modules.