Fan/current module refactoring