One more step in cookery arch refactoring