Refractoring towards a decoupled structure