Rearranged the server, added nconf