Refactor coordinator into separate class