removed 5 modules and renamed one