split service
fix namespace