reorganization of how modules are loaded