Moved services out of main config file too.