Reorganization to modules.