Current/fan module refactoring.