Reorganizing modules.