Refactor services out of orders