renamed some server types, added some server types, updated config files, replicated some code