Refactor in process. Changes in responsibilities