renaming modules and cleaning