Fan/Current Module Rework

Rework of the Fan/Current module