[Changed] Reorganization of the Module configuration