Rearranged some server and config code