Moved more services out