Moved loction of strategy pattern