Reorganization of entire module