Fan/Current Module Refactoring