Initial work on server types
Config moved to lib. Tests and benchmarks