'Change Module' refactor