Sw refactor - Refactoring for Switch module