Moved out Cfg and WServer into new files