Refactored settings
Separated client and client-server