removed dari_server duplicate
re organizing