Customer module refractoring