Renaming and removing some modules