re-structure and test of server config