seperate server config from src
seperate server config from client
merge conflict solved