Update MovingAverageModule to new layout