Sw refactor - Refactoring for Switch module and Packstack Module