Renaming of modules and adding of new subpackages and modules