Fix server and keep config out of services