Reorganizing config files
Updated server names and miscellaneous settings